Merge branch 'MDL-38688_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:41:25 +0000 (02:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:41:25 +0000 (02:41 +0200)
commit1c49f7ad1986db9b96464bdbb221021a1f2fe910
tree60c499f4f3b7bf426cd5a969a05e5d24d204bb30
parent49b902f858dd8819cbba8ed0eb1710c89703d89b
parent00f074620e043c5cf004258a7c0f7d6fdf8a45e3
Merge branch 'MDL-38688_master' of git://github.com/dmonllao/moodle