Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 21 Mar 2012 14:51:52 +0000 (10:51 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 21 Mar 2012 14:51:52 +0000 (10:51 -0400)
commit8b4016f7a8e336f836246b250067b95c0cde1b5f
tree4058553bc96327aaea460ace9f8307b932cada93
parentd2a13dcdce1cc548d10286fb5329651dbbc566b9
parent2ef50c0a388aabcb84a3f3bfc1c3df2f047560cf
Merge branch 'master' into test

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