Merge branch 'MDL-34841' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:15:14 +0000 (01:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:15:14 +0000 (01:15 +0200)
commitb18816beaeed4123c990fbc8ee6c06063f5abff0
tree314cd19eab03e96f373e6ec49724c4e7be32ae1f
parent742b6984fccd6953b2b5b6098a9231e1f3f5e8f8
parentcacb8fa08aa81effc22223feb89015a68cf74b48
Merge branch 'MDL-34841' of git://github.com/timhunt/moodle