Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 20:34:22 +0000 (09:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 20:34:22 +0000 (09:34 +1300)
commitf44e7d0a772514bef53ef480e4f5e5469deb2864
tree247dd102129f1e181cc00e4bb1ca75ca16bb0bdd
parent60fb0ef8a97a8a6a34ab79e2f455b93cb85450b0
parent0e35ba6ffc63e5a80bbae311e1155ec8f9131a93
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle

Conflicts:
user/view.php
18 files changed:
course/lib.php
enrol/paypal/ipn.php
grade/edit/tree/lib.php
lib/enrollib.php
lib/filelib.php
lib/moodlelib.php
lib/odslib.class.php
lib/outputrenderers.php
lib/statslib.php
lib/upgradelib.php
mnet/lib.php
mod/forum/index.php
mod/forum/lib.php
mod/lesson/essay.php
mod/lesson/view.php
question/type/calculated/questiontype.php
report/outline/index.php
report/security/locallib.php