| commit | d310a8760513d755a69c51d9576504cdf8a8f646 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Wed, 8 Jan 2014 16:29:45 +0000 (8 17:29 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Wed, 8 Jan 2014 16:29:45 +0000 (8 17:29 +0100) | ||
| tree | cbee634660cc6b577c418ff687ea4bcdfb7ce970 | treesnapshot (tar.gz zip) |
| parent | 1f4b6a1e03776e534503f5aa3fec73134618c434 | commitdiff |
| parent | e88d9d7caf75994c00c1f7c95180aac672696eb2 | commitdiff |
Merge branch 'maint'