| commit | cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2 | [log] [tgz] |
|---|---|---|
| author | Éric Araujo <merwok@netwok.org> | Sun Feb 05 13:49:59 2012 +0100 |
| committer | Éric Araujo <merwok@netwok.org> | Sun Feb 05 13:49:59 2012 +0100 |
| tree | 3e40b36621bfc2f4140b612d8a6d2ed01d1f9e39 | |
| parent | be095b3b9857a5b949dd23b89dac5f5151b252d5 [diff] | |
| parent | cd2a6033ac0bafd69a7cba2d132e092127acc895 [diff] |
Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715)