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)
commitcc624bf304d1de3a8892ffeaa30c44c0a085e831
tree193f81f734204aaa6efcb3af4d0d047cd8c55992
parent58014aec0e1260aa6d1e0e63eee2b11a4f55b2ac
parent3fdb3732ddbc8a99de9bee37c17a56d243e7403e
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
project/rh/views.py
project/rh/views.py