Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Fri, 17 Jul 2015 10:06:40 +0000 (12:06 +0200)
committerjenkins <jenkins-int@bgbm.org>
Fri, 17 Jul 2015 10:06:40 +0000 (12:06 +0200)
commit098552de2ec2791073b76ace0fa0333972f5cad2
treeec124840fff3e65cf0a04f5d7e640a2a7bb2ec74
parent2fb13c4e56e580805dc2c39c5da124dcc5d83631
parent38bd59bc2b422084486a8f6390e4ecc13de24154
Merge branch 'master' into develop