Merge remote-tracking branch 'refs/remotes/elrond/sql/final'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 1 Apr 2012 20:36:11 +0000 (15:36 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 1 Apr 2012 20:36:11 +0000 (15:36 -0500)
commite089b66bde44ec90950a0acc9d471245295ffa4e
tree0c73c429ccbb312c5be22a17f4ee954f9461e75f
parent1e3a0e0ca0c58ae740424fa6cf239f2dba5dc592
parentbc27a100fc05cea72c47d8ae446454d347d0a0ff
Merge remote-tracking branch 'refs/remotes/elrond/sql/final'

Conflicts:
mediagoblin/tests/test_submission.py

Also, WHOO SQL SWITCHOVER PARTY!

        ASCII DANCE PARTY

    /_o_/    \ /   \o_    o
     (       _|_    )    //)
     /\     / o \  /|     /|

      *BMCH BMCH BMCH BMCH*
%
 /_o_/   HHHYAAaaaaa
  /_
 / /
%
AAAAAHAHAHAHAHHHAAHA
       ,,          .------
      o_o ;;       /\\     \    $  __
      '\/ ||      // \\     #     /_/
        \//      // //\\     \
         )             \\     \   %
        \\              \\_____\
        | )            //-------
       /_/_           //     //

       SWITCH YOUR DATABASE
     FLIP A FUKKEN BOOLEAN
%
             __________
          .-'          '-.
        .'                '.
      .'  _--_        _--_  '.
     /   /  (_).     /  (_).  \
    .   |      |    |      |   .
    |    ._____,     ._____,   |
    |   ____________________   |
    |    |                 |   |
    '    \                 /   '
     \    '.        .----./   /
      \     '._    /     /   /
       '.      '--------'  .'
         '._            _.'
            '----------'
mediagoblin/tests/test_submission.py