Merge branch '0.4dev'
authorFred <fmcell@gmail.com>
Sat, 18 May 2013 13:53:40 +0000 (21:53 +0800)
committerFred <fmcell@gmail.com>
Sat, 18 May 2013 13:53:40 +0000 (21:53 +0800)
commit8f3a8dcff9b683b48b7d85e17afa3756971b2a22
tree46cc7fe5fb8652a0a9e8a56d2914f27303a522b3
parentf751707a31f5a21dfb92fa4e355a300e1b7f48d4
parenta24ba92fba6f43e2ecdac0a9f85cac0a0fb0ba9a
Merge branch '0.4dev'

Conflicts:
CHANGELOG.md
lib/git.py
lib/jira.py
lib/moodle.py
lib/workplace.py
moodle-backport.py
moodle-behat.py
moodle-config.py
moodle-create.py
moodle-pull.py
version.py
lib/jira.py
lib/moodle.py