| commit | 2527796a22404d5b8cb0e498a965c6b4a743caac | [log] [tgz] |
|---|---|---|
| author | Éric Araujo <merwok@netwok.org> | Fri Jul 29 03:11:09 2011 +0200 |
| committer | Éric Araujo <merwok@netwok.org> | Fri Jul 29 03:11:09 2011 +0200 |
| tree | 5bc07b91dde0085cc09c3336ed740f6817f11fc3 | |
| parent | 1e3a68d36b08cd9d59084a37c8cb6c2d911868ce [diff] | |
| parent | cf534817adc49b2562d175fabd3e3992d25063fe [diff] |
Merge from 3.2 (#10318, #12255, #12043, #12417 and other fixes)