Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorDavin Baragiotta <davin.baragiotta@auf.org>
Fri, 27 Jan 2012 19:03:04 +0000 (14:03 -0500)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Fri, 27 Jan 2012 19:03:04 +0000 (14:03 -0500)
commit06f956a2b2268263c793ed8fd1b0e412b3078c4a
tree34f7e5ec02ee24a727cefa885c91cca74038e1e6
parentfd8e52b5b26abfe04a5c09a8b843ded122fc3bd1
parent48a6df80c9ef9c5962a773c0014e7842710f2d02
Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
src/auf.django.emploi/auf/django/emploi/models.py