merge trunk into 36 branch
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 14 Apr 2015 10:58:46 +0000 (10:58 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 14 Apr 2015 10:58:46 +0000 (10:58 +0000)
commit4ccd7bc8a7699b557e976d06508d5a50690e5b40
tree266ca874880dd5f6fd58f21f2044982b0efa34f7
parent3a3ded3180dacdd8fdf73bbf18426956e62d2211
parent0035631b446dc2275156663f8f3b4b684818f4af
merge trunk into 36 branch