Code

Merge remote-tracking branch 'mfournier/more-changes-for-5.5.0-3'
authorBernd Zeimetz <bernd@bzed.de>
Thu, 10 Sep 2015 12:53:59 +0000 (14:53 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Thu, 10 Sep 2015 12:53:59 +0000 (14:53 +0200)
commit68b493b30dec1560af38a79e64ea799972aef34b
treebd50e28e686d2a0e6f3c16d014530132fb83cd1e
parent658f18794afb9f9e745ac77489e60fb36cb565eb
parent72f2e99f4904f6a0acab64dd41fc71159fd5dedf
Merge remote-tracking branch 'mfournier/more-changes-for-5.5.0-3'