Merge branch 'MDL-46458-master' of git://github.com/jleyva/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 13:14:39 +0000 (21:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 13:14:39 +0000 (21:14 +0800)
commit6b58a6a44534f9817775cd1578b4789a60a7b880
tree14fcb68866be20306fe49c17dd6a13787769db4e
parenta3514938465a964133e7de6e0a49212395e0d3c6
parentef8a44dea05bcddcf371bcade6e1c212251ff0c1
Merge branch 'MDL-46458-master' of git://github.com/jleyva/moodle

Conflicts:
version.php
lib/db/services.php
mod/forum/externallib.php
mod/forum/tests/externallib_test.php
version.php