Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:29:59 +0000 (23:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:29:59 +0000 (23:29 +0200)
commitb8968449428c02d0e5b48c175efde72b030f4976
tree13738f6dc9d27efd9b38f6852917872a3edc603b
parent5bd80500f2125137cbb33b95fdbd073ee60bc7e1
parent1091aca74f6703539ec4ee2688fc5d79f9546a48
Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle