| commit | e396c363cbacce68d7750a7963af4d7cd3bf30e7 | [log] [tgz] |
|---|---|---|
| author | Charles-François Natali <cf.natali@gmail.com> | Fri Jul 25 18:45:02 2014 +0100 |
| committer | Charles-François Natali <cf.natali@gmail.com> | Fri Jul 25 18:45:02 2014 +0100 |
| tree | 40f9f102e9d7908e6bf4349128d42419e8735fec | |
| parent | 65708cf510277492660420efa13bd2de163cd21b [diff] | |
| parent | 2955a0bf06807d4e00ad053a7e2acb516939859e [diff] |
Merge.