Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Dec 2012 18:56:31 +0000 (19:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Dec 2012 18:56:31 +0000 (19:56 +0100)
commit771b82028500b2b2e5af1245acc684bee4dbe4c3
treea2388265f0f9dd0ac28735be0a291850a8de713f
parent6b9dfe731e3860aa5f7b36cdf1752a165c72f90b
parent1e4bd9fe2523a802cc16e15d6a86446a58fa40ae
Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle