Merge branch 'MDL-34742-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 03:59:14 +0000 (11:59 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 03:59:14 +0000 (11:59 +0800)
commit74c0bc34d7a4e09e527518eb3311ef746e64b834
treef6990b3351c3b51fcb68fa35d8881dc07508a11d
parent92158c9b4ad11a62fe64748c719e742b191edc16
parentdbc623c4fc5420dd8a3617d17342bb96eeec766a
Merge branch 'MDL-34742-master' of git://github.com/FMCorz/moodle