Merge branch 'MDL-38455-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 06:53:28 +0000 (14:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 06:53:28 +0000 (14:53 +0800)
commitec6089f07b8ef7336de239382c2b6a3b2a795e2a
tree28ee2eb7dc0b85ce7e875d2075fdb126b8e280f2
parent534ee16ec017fa362d1279223abc28a24bac1a63
parent90a7e556af0a13df70e923ec8df584718d47f148
Merge branch 'MDL-38455-master-int' of git://github.com/FMCorz/moodle