Merge branch 'MDL-48067-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 10:15:41 +0000 (10:15 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 10:15:41 +0000 (10:15 +0000)
commitfb3e9ea25d02c56ea3c028702e0332c35ae4d2ee
tree3a756866e60d72aaa3d885d3c7fc9a99c7255553
parenta75cc21442b8e1f34a43de642065b331ac0cb734
parent088fcf90ca941a06ac76a5faac8ca85f6bae63f4
Merge branch 'MDL-48067-master' of git://github.com/jethac/moodle