Merge branch 'MDL-31245-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 17:45:29 +0000 (18:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 17:45:29 +0000 (18:45 +0100)
commit5f67e1f395797efb5e30f6a569bac689fb86ee2e
treeebb7c9635fd9c1618a2fe06de0704e406557e91b
parentf37b3defb187774b1d29553331765495870ecb7a
parent7aefaa91c9827910583635b985d9334b9e1c7f67
Merge branch 'MDL-31245-master-1' of git://git.luns.net.uk/moodle