Merge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 23:52:42 +0000 (00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 23:52:42 +0000 (00:52 +0100)
commit6501e6e0374a1cf036b023294dc1a5506f6934e0
treed2b5f4895e5b6f8e0e3ad79893ad39a4077d3987
parent37027f431b306acfb8feac8f6c70af7aaa4ad373
parentf40c37d005b962afc345239e694860ccda33961e
Merge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle