Merge branch 'master' of https://git.lemmasoftware.org/Merlin
authorTrevor Irons <Trevor.Irons@lemmasoftware.org>
Thu, 1 Dec 2016 21:38:31 +0000 (14:38 -0700)
committerTrevor Irons <Trevor.Irons@lemmasoftware.org>
Thu, 1 Dec 2016 21:38:31 +0000 (14:38 -0700)
1  2 
src/Coupling.cpp

Simple merge