Merge branch 'MDL-23646-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 05:55:51 +0000 (15:55 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 05:55:51 +0000 (15:55 +1000)
commit8bed37619e31de0ff09bcc1efb650fa95230cadc
tree63cef4c5f2111f8d18f4c8bf8179ba9099899cb5
parent84842f54dda9ba635db816b915b567a6cb662fa8
parentb9bca41b536aea290dad4a95a7ea523b5e6630c1
Merge branch 'MDL-23646-master' of git://github.com/damyon/moodle