Merge branch 'MDL-29598_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 21:23:26 +0000 (23:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 21:23:26 +0000 (23:23 +0200)
commit71ff7c2c043b682c7211ef4481801cdf12b30e41
tree24a54241f7ba1f03573669fe45485683383b3e39
parentaf1e3f282884bba5114148ea228fa9b334ca3056
parent67d4424a6b85243f3cfa8c504e4641dc234c2bdf
Merge branch 'MDL-29598_master' of git://github.com/dmonllao/moodle