| commit | 248bc714b595cd8982599c8c1b6d6befd9167eff | |
| author | Bastien Guerry <bzg@altern.org> | |
| Wed, 8 Jan 2014 17:32:00 +0000 (8 18:32 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Wed, 8 Jan 2014 17:32:00 +0000 (8 18:32 +0100) | ||
| tree | b31a34cc924853fda9d4b099a66fe5f79f2266dc | treesnapshot (tar.gz zip) |
| parent | d310a8760513d755a69c51d9576504cdf8a8f646 | commitdiff |
| parent | 884faddd575d9615efa867c68a62e56788ade5ec | commitdiff |
Merge branch 'maint'