Merge branch 'hotfix' into recrutement
authorPA Parent <paparent@paparent.me>
Fri, 8 Jun 2012 15:19:05 +0000 (11:19 -0400)
committerPA Parent <paparent@paparent.me>
Fri, 8 Jun 2012 15:19:05 +0000 (11:19 -0400)
commitcd6c30f7369dcd713319594be524a1017bbd9358
tree0bed2b77449e3ed40fb92e0e60abb93ce5cbd174
parent44635e26663cbfd40b97f0402c4ced209a8b3042
parent27a3b6f965864f2b1c7f3b0992c92975c0eabdee
Merge branch 'hotfix' into recrutement

Conflicts:
versions.cfg
versions.cfg