Merge branch 'MDL-31496_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Sep 2012 00:20:25 +0000 (12:20 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Sep 2012 00:20:25 +0000 (12:20 +1200)
commit3d1cbc0df3e7175f80e2526340f75bd33be98363
tree75a2baf14a61cd1570c15c85c5e0ab3586481883
parentb739e2d71a90fceebefdd3d4d3b01b3a559992ce
parentb16b42e9e259dc9900af6ade4bf089a15f1799fe
Merge branch 'MDL-31496_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE