2.17 shape
Merge branch '2.17' of github.com:jpvoigt/lalily into 2.17
templates
Merge branch '2.17' of ssh://elektrophon.de/home/jpv/git/lalily into 2.17
Merge branch 'master' into 2.17
merge master
shapes.ly
Merge branch 'master', remote-tracking branch 'origin' into merge20130320
Merge branch 'master' into 2.17