commit | 15a98cd30cc410289fee82be283dbd92b9ba1681 | [log] [tgz] |
---|---|---|
author | Ezio Melotti <ezio.melotti@gmail.com> | Fri Apr 12 16:24:12 2013 +0300 |
committer | Ezio Melotti <ezio.melotti@gmail.com> | Fri Apr 12 16:24:12 2013 +0300 |
tree | 855ce03d52fdc0159f810e3659ba428b4aacadbe | |
parent | 2175b4ff287ff847c0a0f6c004dd4e2ba1d8be9e [diff] | |
parent | cbc2d29636f129e4cb9329e18c1ee1f03e7a9696 [diff] |
Merge heads.