Merge branch 'MDL-49937-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 23 Apr 2015 07:53:31 +0000 (15:53 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:18 +0000 (10:19 +0100)
commit9dbcdd8b1fcc05d7829e29f24ea94eb4cef55d3e
tree385295707ca8a92abde4fd620a29752be2c650d9
parent1cbfb6778928a1dbdf37b8b5432f360f443ad4d5
parent8352aa50f34be352148df668b4e3361af0e765c1
Merge branch 'MDL-49937-master' of git://github.com/jleyva/moodle