Merge branch 'MDL-33562-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2013 22:48:50 +0000 (00:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2013 22:48:50 +0000 (00:48 +0200)
commitf49cd5fcd8551595cd79b60f763d0fb2f53bd711
tree0de0001924039f6a3007224dac3280f0fd166706
parent62c4ccef0e025a71d497341de0af9448bd51aa43
parent8feae80284360d02641a3a398ecaaabff390a25e
Merge branch 'MDL-33562-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

Conflicts:
version.php
lib/db/upgrade.php
lib/moodlelib.php
version.php