Merge branch 'yuidoc' of https://github.com/andrewnicols/mdk into yuidoc
authorFrederic Massart <fred@moodle.com>
Wed, 5 Nov 2014 04:10:09 +0000 (12:10 +0800)
committerFrederic Massart <fred@moodle.com>
Wed, 5 Nov 2014 04:10:09 +0000 (12:10 +0800)
commitd99b96b008144ba794517c0251fe53d2bdf30742
treef94a775001b1d4e2e043aef61bf6c5e9b430f0e9
parent508d55210115b6e063b18e44bf5d3ddf2d199af6
parent42ed047d874aa5aa330259f6464d556d6cb4b675
Merge branch 'yuidoc' of https://github.com/andrewnicols/mdk into yuidoc

Conflicts:
mdk/config-dist.json
mdk/workplace.py
README.rst
mdk/commands/js.py
mdk/config-dist.json
mdk/js.py