Fixed conflict
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 10 Apr 2012 21:03:12 +0000 (16:03 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 10 Apr 2012 21:03:12 +0000 (16:03 -0500)
commit011daee7efbfe626ecc8cbbab463133f4b507ef2
tree6b830950856b745907cd6425990eecb5c2cd271e
parentbab8ce55e77ea2e7bf5e1179718c2974a9db6f30
parentaa2c508ed5370525d13a7349bd3d7033d717222f
Fixed conflict
project/rh/admin.py