Merge remote-tracking branch 'origin/develop' into develop
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 18 Jun 2015 13:22:24 +0000 (15:22 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 18 Jun 2015 13:22:24 +0000 (15:22 +0200)
commit16016d51518dd48d589bc51aa2f7d437462428eb
treee74348a421c528f58b22de820171c1fd40fe0e06
parent64528d1a793ea8220d446611048dcd17f59ec7e3
parentd24b444b7bf4e1bd048f864bcfede121794caddf
Merge remote-tracking branch 'origin/develop' into develop