Merge remote-tracking branch 'origin/bug-1288' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 4 Dec 2014 21:50:46 +0000 (22:50 +0100)
committerMichael Tänzer <neo@nhng.de>
Thu, 4 Dec 2014 21:50:46 +0000 (22:50 +0100)
commit86c04b83870dc547fdcef25f91b1bc3b1de53619
treea67552a56bff763fffbe17833cdcb8481e52328d
parent30736116cfec98374195654a4f72e7b12a543af5
parentae094ec445fb164e1b6d5c369ae9556bb9c521cd
Merge remote-tracking branch 'origin/bug-1288' into release