Merge branch 'MDL-39041-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 03:57:49 +0000 (11:57 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 03:57:49 +0000 (11:57 +0800)
commitaefd2e5d35a76acfd543cfa24bcaccb5160eebc0
treeebecf64a6740b9b875210bb7108bc2b534f2008f
parentf8ddbd24d74e7f212a1510112f2acb954e112236
parent5091b20052b149f907a0d584db0ccff83940d739
Merge branch 'MDL-39041-master' of git://github.com/damyon/moodle