Merge branch 'MDL-28513-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 21 Jan 2015 01:52:55 +0000 (09:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 21 Jan 2015 01:52:55 +0000 (09:52 +0800)
commit59da38ef8a7c77137c9372ba4c8f9ed4c3067f46
tree72526805a7f6fee23844ef3d7332e84c908638f6
parent6d33cf76cd4da8233dd66d53861be721c6efdb1b
parentda992717f445d414eace82b175b839c2100b7aa6
Merge branch 'MDL-28513-master' of git://github.com/andrewnicols/moodle