Merge branch 'MDL-37523_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:28:10 +0000 (00:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:28:10 +0000 (00:28 +0100)
commitf941a7864b4574c9800aca761b1e4f4563d393db
tree0694a3bbbe4704a96a1266bf03a3d3925c01acbd
parent208f59137a92e4484407e5b82d72fcfcd2832da1
parent1d4bfa094a3dff9bb99f58f764285e97936cf39b
Merge branch 'MDL-37523_master' of git://github.com/lazydaisy/moodle