Merge branch 'test' into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 30 Apr 2012 15:42:48 +0000 (11:42 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 30 Apr 2012 15:42:48 +0000 (11:42 -0400)
commitb810d793f0a1424046ff792429ec5ff87b4d5921
tree4f5eb426d96a0f7e8949dce77240ce33af56d660
parent68d2688e2858411881e10f597664bb3d48489c04
parent8796fe1209d1d32f2dc67856195c3f142e1c39ab
Merge branch 'test' into dev

Conflicts:
auf_savoirs_en_partage/savoirs/models.py
buildout.cfg
versions.cfg
buildout.cfg
versions.cfg