| commit | bbcfc1f2d926c1198b4c23a6e5640e3f3aee9d98 | [log] [tgz] |
|---|---|---|
| author | Éric Araujo <merwok@netwok.org> | Wed Mar 23 03:43:22 2011 +0100 |
| committer | Éric Araujo <merwok@netwok.org> | Wed Mar 23 03:43:22 2011 +0100 |
| tree | b895d09843982ea12c860d25507619ef1ec615f4 | |
| parent | b1aef23316b093e042bc6afa7e52cd9d7c95802c [diff] | |
| parent | 48049911d6ff4f3caebc09a28c0a94e0c7ad8842 [diff] |
Merge from 3.1. The fix was already committed to 3.2, but I merged two small changes recommended by Raymond while I was working on the 2.7 patch to ease future merges.