Merge remote-tracking branch 'origin/bug-1301' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 16 Oct 2014 19:00:38 +0000 (21:00 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 16 Oct 2014 19:00:38 +0000 (21:00 +0200)
commitfb720bf477205d505c37a47eb29b965a4dcc2b04
tree3e7163d1ab4763141278fd64f3356d24db943db0
parent621d53d01f38c023e4947f4bbe1d31d984809465
parentea4fe47d7f3fb6926bae6d360c9d61e805999e00
Merge remote-tracking branch 'origin/bug-1301' into release