Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Jan 2013 10:13:13 +0000 (11:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Jan 2013 10:13:13 +0000 (11:13 +0100)
commit72a504dc2ae3da6ff5a46f495d167ebe12d1091e
tree90fcfb7ab96d9620eaccd376a1563241ee181ded
parentfaf3016f353d1083767605fc713d9f9832c7d9d9
parent941294ef435aee715edb5b87be1615bff897dc49
Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle