Merge branch 'MDL-47269_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:28:29 +0000 (01:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:28:29 +0000 (01:28 +0200)
commitda483a72c8d8cddef24fdecd4e7c9225c676382b
tree4a3a7f5739ccb863274342dc4f4bd814b650a1f8
parent44af6d53a7dc2e623a44ab79f132c99759449c4c
parentf2ee054b52159a70726fa99ee68a27a2a90e950d
Merge branch 'MDL-47269_master' of https://github.com/nadavkav/moodle