Merge branch 'MDL-39851-master-squashed' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 02:56:26 +0000 (10:56 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 02:56:26 +0000 (10:56 +0800)
commit4dca09b17750f2fcd3b3a10e3f5155021f95cdc8
tree8d126a3dc81608c7848dd504df933a5ccf0c34dd
parented0724271388f293033663fd96d491fa7e1f5f9b
parentbf7c86cfcf4612477e9ee417f6ad2fbc52c48cc4
Merge branch 'MDL-39851-master-squashed' of git://github.com/damyon/moodle