Merge remote-tracking branch 'origin/bug-1219' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 15:22:50 +0000 (16:22 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 15:22:50 +0000 (16:22 +0100)
commitbe7573a378a88bdc8574a613a068097503f40d6d
tree42ccd8b665f142f0d601dc7d7c073265382e1074
parentb65dcec9da0414797ecd43af71a755df99c324c5
parent0e36f8f6a5d4a97fc66e9033ebd8e186663f3d55
Merge remote-tracking branch 'origin/bug-1219' into release