Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 26 Oct 2016 08:05:03 +0000 (10:05 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 26 Oct 2016 08:05:03 +0000 (10:05 +0200)
commit0f1f10726403cd547dffb700615876e92a38e4cf
tree243fa2930e815cb1672e80982f7f5692f982a03c
parentc6476daa5094f992b235fd7c4d10c17b90dc0e8b
parent63892e705147ff0ff15b43f65f9e416a2ce73fe8
Merge branch 'develop' into LibrAlign