Merge branch 'wip-MDL-47174-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 01:15:44 +0000 (02:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 01:15:44 +0000 (02:15 +0100)
commitdc3fab74ae9684c57c3af8043bd08270be0d73af
tree3fdcf840db225bbbaee37a34d41af92017c68c5d
parenta376c72a05b2f1a3bcbcd9828073d3325ea4c2ad
parent8f94164df348c0bc71f18010fbe55b9f0386b9ce
Merge branch 'wip-MDL-47174-master' of git://github.com/marinaglancy/moodle