Merge remote-tracking branch 'origin/7.0' into 7.0-lp1303829
authorHolger Brunn <hbrunn@therp.nl>
Mon, 15 Sep 2014 08:38:11 +0000 (10:38 +0200)
committerHolger Brunn <hbrunn@therp.nl>
Mon, 15 Sep 2014 08:38:11 +0000 (10:38 +0200)
commitc751b6d5edeb59b9948071c71a65833ff0a2a320
tree3dd71fd3f773214cf138b77ac18e99594d684567
parentb394a85cd33bbdda9f2751412ffb69fb7c0701d2
parent7fa693dcf77321505f8e3db19ec7065a6b867e1b
Merge remote-tracking branch 'origin/7.0' into 7.0-lp1303829