Merge branch 'test' of git.auf.org:auf_savoirs_en_partage_django into test
authorEric Mc Sween <eric.mcsween@auf.org>
Thu, 26 Jul 2012 13:43:19 +0000 (09:43 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Thu, 26 Jul 2012 13:43:19 +0000 (09:43 -0400)
commitfecfea88522782e6f7f4114c1d47e42a163ea66d
tree1f8311c8d7b319309cfcc4a6894a16147f62759c
parent61c4563e2716836ea33d816066b8bb8f006af69a
parentf497732d0c4721c830bbcc8b6ed8184c91557e0b
Merge branch 'test' of git.auf.org:auf_savoirs_en_partage_django into test