Merge remote-tracking branch 'origin/master' into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 8 Mar 2012 17:05:15 +0000 (11:05 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 8 Mar 2012 17:05:15 +0000 (11:05 -0600)
Conflicts:
project/rh/views.py

1  2 
project/rh/views.py

Simple merge