Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 07:42:32 +0000 (15:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 07:42:32 +0000 (15:42 +0800)
commitdea614e49358b1fd145141e6ff2a7deb44c9d274
tree6f50ed169e7001d05c56b48af67a38eb0ab7e939
parent8c3966773be69cc7121663f8a87c8857d4287dd7
parent702851c071e774cbb37e359d7cabde1cdc936e6a
Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle