Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 10 Sep 2015 15:55:52 +0000 (17:55 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 10 Sep 2015 15:55:52 +0000 (17:55 +0200)
commitd8812195116b4e400bf259da715fc75468a4d1ec
treeb3e361d4c65ca362f039e33807e6f7c38379b664
parent1f957550526919d0041dce81d6fb6bc2d10a9906
parentd00a3071a67f052f2af91d58514f4ed4d26c9951
Merge branch 'master' into develop