Merge branch 'MDL-38804_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:44:59 +0000 (01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:44:59 +0000 (01:44 +0200)
commitcd4c7e9af40e2931c8b362ff4017bb9781d67964
tree1693dc3606c06b397461459a2e774fe1f7ab46bb
parent0f8fd3a7eb5d918e477b07381173a01208a2794a
parente7a0600b8846ed6f449510fe7d0a8f85a209df1f
Merge branch 'MDL-38804_master' of git://github.com/dmonllao/moodle