Merge remote-tracking branch 'refs/remotes/joar/notifications'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 22 Jun 2013 21:13:41 +0000 (16:13 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 22 Jun 2013 21:13:41 +0000 (16:13 -0500)
commit257b8ab62a6a5e04d60575a9766e5ed3503a15ed
tree5d998fd1b955cb180ad1010c07ec35b1fd945b1b
parent75ee3de301e7bea30c40fe26d857bb6cc7878f82
parent0c7fa7556ced34444db82d2d2d3b51b4f5327586
Merge remote-tracking branch 'refs/remotes/joar/notifications'

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py