Merge branch 'MDL-32514-master-1' of git://git.luns.net.uk/moodle
commit55a0c2d787d888aab1f22b8e613606f92aed216a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 23:42:28 +0000 (24 01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 23:42:28 +0000 (24 01:42 +0200)
treeb1116bc3042bf2259428556e1632f3e4fa053ceb
parent59894544989de8d13ea35638332cdb764c9b9e9f
parent2e83961018e7fee9478e09268c530ef421dcb218
Merge branch 'MDL-32514-master-1' of git://git.luns.net.uk/moodle