Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 8 Apr 2011 01:05:24 +0000 (21:05 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 8 Apr 2011 01:05:24 +0000 (21:05 -0400)
commit4e0640d54a35cccdb6d81f588a2c48eb3134d04c
treec140c74ef594b164281e5b1d35283a1bf8811ff3
parent363411257db51a2a199482199dcf1d9c3c7d0f82
parent433c14c6f802df50fde5027a36bd0826ed9d3ac2
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
project/settings.py