Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 16:06:22 +0000 (17:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 16:06:22 +0000 (17:06 +0100)
commitfedcc830162adfd28a8a0146bf3070b9e6a6b012
treed5de5eb7bad7d1709591b6d9d9f33864bde084b1
parent25919739fd27dafe6b2d2f9476d1eb953959c511
parentacfee0d4baba4c214dabcdcd94ed8eb7a2d62c79
Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle