Merge branch 'MDL-38883-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 5 Apr 2013 00:48:37 +0000 (02:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 5 Apr 2013 00:48:37 +0000 (02:48 +0200)
commitdbc5692fc5a748c0f214773c8efc72b246eebc8f
tree7679640c941c175787c04cfc62cbecb08f1cad5a
parent8f3885f23d051632ef12b8b7fbe79aa3f095e582
parentd60ee78a5f854deb63a1a5a21b0bd8308a487044
Merge branch 'MDL-38883-master' of git://github.com/danpoltawski/moodle