Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 May 2012 08:10:06 +0000 (16:10 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 May 2012 08:10:06 +0000 (16:10 +0800)
commit77cb9b6ce65768ba3809440d01372d86d2381877
treed488f5b5d312695a62ac28ef3b00a21aca17df74
parent5c44b0355949b58eee08f4791555fc15eab0632e
parenta9352f1f3c62675765b25e099c3deab032fcc0d4
Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle