Merge branch 'MDL-37533-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
commit6e607d44c01de460f506433fec5a7501c070ee1b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 14:35:20 +0000 (29 15:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 14:35:20 +0000 (29 15:35 +0100)
tree8ed3744a15528dc9d91edb89cdcaa43492d948b8
parentaebbfda077d4905e7e546c19026e96f34f93bda3
parentdb2a65bfa9589f2212baef2320dd3c0dc6de2ebf
Merge branch 'MDL-37533-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE