Merge branch 'qbe' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 14:01:20 +0000 (10:01 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Tue, 5 Jun 2012 14:01:20 +0000 (10:01 -0400)
commit6bf22a136dacea9ce3b9072120088baa7ffe4325
treec5f503256ffd9069e0fa94368c7d5c65b1442433
parent3ae64af45c4352ac797cfb3aa5d9077cc3533d4f
parentfcea3998a0ee75f2c978fb59b52f2002c718fb51
Merge branch 'qbe' into test

Conflicts:
versions.cfg
buildout.cfg
project/settings.py
versions.cfg