Merge branch 'MDL-37518_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:13:48 +0000 (00:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:13:48 +0000 (00:13 +0100)
commit208f59137a92e4484407e5b82d72fcfcd2832da1
tree113591d0f9f4c0d35585557578a255bf63370928
parent1615caae6f571e339f564a949684a564e058f0ed
parentdf7d171fc35bda038f7456e592b34762f72f9ad8
Merge branch 'MDL-37518_master' of https://github.com/markn86/moodle