| commit | b2fa280e9e1da3724a81f47a4659cc3526d95a96 | [log] [tgz] |
|---|---|---|
| author | Charles-François Natali <cf.natali@gmail.com> | Thu Aug 29 19:26:12 2013 +0200 |
| committer | Charles-François Natali <cf.natali@gmail.com> | Thu Aug 29 19:26:12 2013 +0200 |
| tree | c0c93e70ba14caf72f25b470abb60c5940c0af31 | |
| parent | 6d5bd5258cd14abf419e238513835217b8d048dd [diff] | |
| parent | 5aac8b7c2cecd636004f32ec5d7c5a4331fddb17 [diff] |
Merge.