Merge branch 'MDL-46118_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 20:33:13 +0000 (08:33 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 20:33:13 +0000 (08:33 +1200)
commit03384ff9fda42990d8548bcad330ad5e2b999693
treea5b68748b637139efb0a8153f3584de0ff829f06
parentf74b3cd8bcbc982bac7a51cb9069a0a445647fef
parentfb9a2cddfbf606311a8ad622c0b2d8f5204eca2a
Merge branch 'MDL-46118_master' of git://github.com/dmonllao/moodle