Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:54:13 +0000 (09:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:54:13 +0000 (09:54 +1300)
commitde878a38c8c50ecf4b89a2a00f3fda1a8bd50e57
tree5946f8fc873d6732e01399ea170fb22b91a94944
parent8412561a3d3451e65fee6ecc55659e4b45e2cd0e
parent6538153bbd3e2db59350f1f334c6c417974048c8
Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/deprecatedlib.php
lib/deprecatedlib.php
tag/edit.php