Merge branch 'wip-MDL-41317-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commitfb7bb9af1628d4eea789d87ebc46919254cb34eb
authorDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 02:40:34 +0000 (3 10:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 02:40:34 +0000 (3 10:40 +0800)
treecb09315fda1bf0160123c73edcb8b9112a833e41
parent0522e090fbd48184d953361e37e951e395c719f7
parent827c357830b64616ad3469babfdf46f52abd7667
Merge branch 'wip-MDL-41317-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE