From: Fred <fmcell@gmail.com>
Date: Sat, 18 May 2013 13:53:40 +0000 (+0800)
Subject: Merge branch '0.4dev'
X-Git-Tag: v0.4.1~10
X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=8f3a8dcff9b683b48b7d85e17afa3756971b2a22;p=mdk.git

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
---

8f3a8dcff9b683b48b7d85e17afa3756971b2a22
diff --cc lib/jira.py
index 92cbb4c,0cef620..98098f9
--- a/lib/jira.py
+++ b/lib/jira.py
@@@ -23,9 -23,9 +23,9 @@@ http://github.com/FMCorz/md
  """
  
  import json
- from tools import debug, question
+ from tools import question
  from config import Conf
 -from urllib import urlencode
 +from urllib import urlencode, urlretrieve
  from urlparse import urlparse
  from base64 import b64encode
  from datetime import datetime
diff --cc lib/moodle.py
index 8b28a77,ad51a40..85e5249
--- a/lib/moodle.py
+++ b/lib/moodle.py
@@@ -24,13 -24,16 +24,15 @@@ http://github.com/FMCorz/md
  
  import os
  import re
- import shutil
+ import logging
 -import shutil
  
- from tools import debug, process
+ from tools import process, parseBranch
  from db import DB
  from config import Conf
  from git import Git
- from exceptions import ScriptNotFound
 -from exceptions import ScriptNotFound, InstallException
++from exceptions import InstallException
+ from jira import Jira
+ from scripts import Scripts
  
  C = Conf()