Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 09:35:13 +0000 (11:35 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 09:35:13 +0000 (11:35 +0200)
commitfef0a7dbcef066a3ef0fe9b315b90c473addc7ff
tree17e244c7188ea465173860a8940345483ac9553a
parent21413201223751c52b5153cd90f271489cfbee5f
parentce3bd0d2852ba5859400354a1dc6d23d5b75a16e
Merge branch 'master' into develop