Merge branch 'MDL-38852-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 5 Apr 2013 00:51:48 +0000 (02:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 5 Apr 2013 00:51:48 +0000 (02:51 +0200)
commitc5f4080a1051a54bf1418ff4a6c63582d31441be
treef682782f6f8aa07d9ab0cb58ed5cfa54fb048c5f
parentdbc5692fc5a748c0f214773c8efc72b246eebc8f
parentb53ae614821923c4f3141d4cd43c70da2699c2a7
Merge branch 'MDL-38852-master' of git://github.com/danpoltawski/moodle