Merge branch 'MDL-36839-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 06:43:50 +0000 (14:43 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 06:43:50 +0000 (14:43 +0800)
commit4f847182e61a418008a3950551b9902286f2de31
tree3f09a4a0ab6b85f7f412f73acb6f02bc521f3126
parent8e1fbc0fe603bb3067b2dfa4f4625b26a108c54c
parentb45fcbe6252b1e7d2ceccf71ee466eb1d5945b2f
Merge branch 'MDL-36839-master' of git://github.com/FMCorz/moodle