Merge branch 'master' into test test
authorDavin Baragiotta <davin.baragiotta@auf.org>
Fri, 9 Aug 2013 19:50:54 +0000 (15:50 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Fri, 9 Aug 2013 19:50:54 +0000 (15:50 -0400)
commit3af73a5285a7160a4a313af2ba613452563f3bf4
treeae77960fc808349cbb1c1f27fc12a0900556f6b4
parent78e3ee3cd55903a36fc3bfa20453f9080573eb8b
parente998eaa550817040c3b076c63e68e81571f84389
Merge branch 'master' into test
auf_savoirs_en_partage/settings.py