| commit | 772406b5bcf2aedb839496dc95bccfbc26d6c0a1 | [log] [tgz] |
|---|---|---|
| author | Carsten Reckord <reckord@yatta.de> | Wed Jan 21 20:51:36 2015 +0100 |
| committer | Carsten Reckord <reckord@yatta.de> | Wed Jan 21 20:51:36 2015 +0100 |
| tree | 581a06b7f216e4646f4298c08b07be2d9acc9525 | |
| parent | 1a70dc4b4fcc4e3d34c8af6bd4b651b747b7a1f6 [diff] | |
| parent | c1b1e33c6fd0f5651181d7fd46abd66db52f0e4f [diff] |
Merge branch '1.3_maintenance'