Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 11 Jan 2012 22:29:58 +0000 (17:29 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 11 Jan 2012 22:29:58 +0000 (17:29 -0500)
commit701eff8f805b40e68272144820c603adc00f40dd
treeb8aa40dccf7aba7613463f3c206a9d4bb3be0ed5
parent09aa83748e11244c7e30ed72449d6940203d683b
parentbf6f2712d4af7f5c9f9816e27dfec69213545f0f
Merge branch 'master' into test

Conflicts:
buildout.cfg
project/dae/models.py
project/rh/models.py
project/settings.py
buildout.cfg
project/dae/forms.py
project/dae/models.py
project/rh/models.py
project/settings.py