Merge branch 'MDL-40825_master' of git://github.com/dmonllao/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 03:15:25 +0000 (13:15 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 03:15:25 +0000 (13:15 +1000)
commitf64777a93f53f7ff57e8963480c05b07bfab73fd
tree06e2b0a28ee6665481ec23a2cf83e5f7ab6f67a3
parent4c7f0562d07c6d81ec28cf0aacd5cfd8392ddbde
parentb8335fd56bb48314583544616b99ebd87aafe324
Merge branch 'MDL-40825_master' of git://github.com/dmonllao/moodle