Merge branch 'privat' into ready-for-ffi
authorAlexis Laferrière <alexis.laf@xymus.net>
Wed, 13 Nov 2013 20:33:25 +0000 (15:33 -0500)
committerAlexis Laferrière <alexis.laf@xymus.net>
Wed, 13 Nov 2013 20:33:25 +0000 (15:33 -0500)
commit7d93fa50dce942e7f30872d24b0d616788d7c48a
treeee04f96fae87648f121c9668798129e9cab2c7fc
parent601e9a0f1dade9c3533b8bd4952583d1236ba913
parentc3ec8352114a7ad4773b9621babca3a481875208
Merge branch 'privat' into ready-for-ffi

Conflicts:
lib/md5/md5.nit
lib/md5/md5.nit.c
lib/md5.nit