Merge branch 'MDL-38857_master' of git://github.com/dmonllao/moodle
commit55fcd9323e95aabe7c74d0d2883b8e4fed8e05fc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 20:02:18 +0000 (16 22:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 20:02:18 +0000 (16 22:02 +0200)
treed96b658169cfed42add479020b4045f4ec211670
parente28ae962be4601928f0d2dc90dc6cfa595805004
parentcb9c703cca72d2ac65d9a3fdf3496cf0c76a5691
Merge branch 'MDL-38857_master' of git://github.com/dmonllao/moodle