Merge branch 'master' into test test
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 9 Jan 2013 17:07:01 +0000 (12:07 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 9 Jan 2013 17:07:01 +0000 (12:07 -0500)
commit06104e66d0fd286ee5c51c3070094a4bbd1aac5b
treec729792b7cfb0876b20eb4c7ea0540a23cbbfd19
parent38340bbd1ccbb0832d4a6002bf933731e2ebcdf1
parent6e6bc9106a4ce52bce0361e917eff32583d51cd7
Merge branch 'master' into test

Conflicts:
project/dae/views.py
project/dae/views.py