Merge branch 'wip-mdl-31969' of git://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Apr 2013 06:09:14 +0000 (14:09 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Apr 2013 06:09:14 +0000 (14:09 +0800)
commite497e90c76803abeea17a7a7be749a704c05083d
treee147c00a37055a5f8adf3e6ad78f98ed21a8ae43
parent10c56dc13775e3f20e9777a3c4f43dbc5f29ade2
parent38c1dd194d3da8a4b62ac2a912c0351f1cf15294
Merge branch 'wip-mdl-31969' of git://github.com/rajeshtaneja/moodle

Conflicts:
version.php
lang/en/moodle.php
lang/en/role.php
lib/accesslib.php
lib/db/access.php
lib/upgrade.txt