Merge branch 'MDL-38437_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:03:26 +0000 (01:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:03:26 +0000 (01:03 +0200)
commit9f0700fb6caae3b72a6b98a3de24d674beb0d1ad
treeff38cdf83279e425004578877d3f1365ea8cba29
parent62eb5c466e81f4df2d6138719291996c946bd192
parente6cb6aed64e30149d0225d6f9200519936c6763e
Merge branch 'MDL-38437_master' of git://github.com/dmonllao/moodle