Merge branch 'prefixdbname' of git://github.com/mudrd8mz/mdk
authorFrederic Massart <fred@moodle.com>
Mon, 21 Jul 2014 02:04:12 +0000 (10:04 +0800)
committerFrederic Massart <fred@moodle.com>
Mon, 21 Jul 2014 02:04:12 +0000 (10:04 +0800)
commitb1fedb1e9cdb439ce37627abf3bf807993d2f9be
tree84d143e476e0eea56750b6e8db7a123cd22ae33b
parent5afc93171460c3d517d8f5ab8676edec077206bc
parenta8c8b959723c8d28f8a58cbf4831a2b6740100f5
Merge branch 'prefixdbname' of git://github.com/mudrd8mz/mdk

Conflicts:
config-dist.json
config-dist.json
lib/commands/create.py