Merge remote branch 'remotes/cmoylan/test_auth_views_364'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 20 Jun 2011 00:56:25 +0000 (19:56 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 20 Jun 2011 00:56:25 +0000 (19:56 -0500)
commit079868489479550d9d8190cde6109cc39cd6272c
tree2010035b3aaf42bf96cbde800f4d6a18768cf826
parent8b7663a0bd04da856d36b21d219c396c4111a06b
parent12c231c8acc2036330143baa17610b6faa901ad6
Merge remote branch 'remotes/cmoylan/test_auth_views_364'