Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Mon, 21 Dec 2015 10:27:20 +0000 (11:27 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 21 Dec 2015 10:27:20 +0000 (11:27 +0100)
commit05071a15a1a79fb640a5711aaaad1ac7463ce533
treeea1855dc23d9fb5bb80909f709df3695dea520a4
parent5f691b4bb38ad810afccdc0b61ef24b8fdcf4e51
parent0702cb87361852fc5575cebf0494524df8231865
Merge branch 'master' into develop