Merge branch 'MDL-38616_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 16:35:41 +0000 (18:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 16:35:41 +0000 (18:35 +0200)
commita534e06e473893a99d730c38859dcac144adb135
treeff507db0cec23d3e44f7a10ca780acddf28b72a6
parent594d66c27e9f8d2fcba46006f6d4682a545a6017
parent4b528daed5a6a3b7f2f81b979ac4cf2f37aaad1c
Merge branch 'MDL-38616_master' of git://github.com/dmonllao/moodle