Merge branch 'MDL-48716-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Feb 2015 01:20:26 +0000 (09:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Feb 2015 01:20:26 +0000 (09:20 +0800)
commitdb23cd087b0211ed72019ae3f18034b036415877
treefe03c17c6627371ab1b43f73dd87797a039366f3
parent1725c553acffef457043ac27b141f52debde94d7
parentf494a81167028f8f1617ad43ac1f63bf6fd6fdc2
Merge branch 'MDL-48716-master' of git://github.com/jleyva/moodle

Conflicts:
lib/db/services.php
lib/db/upgrade.php
version.php
lib/db/install.xml
lib/db/services.php
lib/db/upgrade.php
version.php