Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 24 Feb 2012 14:32:07 +0000 (08:32 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 24 Feb 2012 14:32:07 +0000 (08:32 -0600)
commit0297804b713aee9e72cc12503693a05850576a7f
treec9490c3b2dc27ef41c8e9be29ae2b8c85971f629
parentfa1624f61a52c5e605106e49f0e397fd204d9a18
parent15061532268d29930ada6c4971df4a8b60b13989
Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
project/rh/admin.py
project/rh/views.py