Merge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:45:43 +0000 (01:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:45:43 +0000 (01:45 +0200)
commit23726a43d48ff6657b6ecf53ffb8c8ff186751bb
tree446919a8bde793fca9c64b19819b265923f25e0e
parentcd4c7e9af40e2931c8b362ff4017bb9781d67964
parentf076b0d43fe2f5f5145076c09580032bee65414b
Merge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle