Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 15 Feb 2012 20:15:15 +0000 (15:15 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 15 Feb 2012 20:15:15 +0000 (15:15 -0500)
commit3e054288cf4e33f33a1b43faed2c1738d2fb9094
tree773e4990a54f5f23500238bb968eb48bddf9a933
parent4bdadf8b3cc68e2b66b0ec4ab63f382fbb7c03ce
parent6c2b11607787af89a158fe30293f6f2f1405b3d7
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
project/rh/admin.py