Merge branch 'wip-MDL-44637-master' of git://github.com/abgreeve/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 24 Apr 2014 08:33:57 +0000 (16:33 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 24 Apr 2014 08:33:57 +0000 (16:33 +0800)
commita44b25a3d3f3169bf87c132be89e6353b1a5d8d3
treecbfac38672c67c42969da915fe3dbd076296ce47
parent7b99722e934782474d7ca2e543f9600274bffb46
parent663aab727d49902eaa955a6864e8f1a50e0443b8
Merge branch 'wip-MDL-44637-master' of git://github.com/abgreeve/moodle