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)
1  2 
project/rh/admin.py
project/rh/views.py

Simple merge
Simple merge