diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-24 17:07:32 -0600 |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-24 17:07:32 -0600 |
commit | c55b82c939e2427cfcbd195bbc94fe5949599987 (patch) | |
tree | 82bdf530a16c17821b96bb9d41ace299ea9b44cc /.project | |
parent | 0da328b5ba0dc8bdb3803a85cef150ffc8a69bb7 (diff) | |
parent | f6877916d84c43a86e239e2343c6779257c8f9c7 (diff) | |
download | askbot-c55b82c939e2427cfcbd195bbc94fe5949599987.tar.gz askbot-c55b82c939e2427cfcbd195bbc94fe5949599987.tar.bz2 askbot-c55b82c939e2427cfcbd195bbc94fe5949599987.zip |
Merge branch 'master' into django1.4
Diffstat (limited to '.project')
0 files changed, 0 insertions, 0 deletions