| commit | 516c51c14c06913ac832b0f50989e83c6f3bb730 | [log] [tgz] |
|---|---|---|
| author | Éric Araujo <merwok@netwok.org> | Fri Jul 29 18:10:12 2011 +0200 |
| committer | Éric Araujo <merwok@netwok.org> | Fri Jul 29 18:10:12 2011 +0200 |
| tree | 93f689b8ed9e3367a152bd8a2c7460f60c6a0687 | |
| parent | c473f8ceac03338657cb30314b4b1c8733b17ac9 [diff] | |
| parent | fe1e298d8bbfbdfd1c2af74dbb74f47e2d04a6d0 [diff] |
Merge from 3.2 (#9254, #8982, #9788)