Merge branch 'MDL-28166' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 17:03:59 +0000 (19:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 17:03:59 +0000 (19:03 +0200)
commitcb600c46060f05e5443cbe259107c4ed4d6e40ff
tree23e3a8a59fbad67cdabb2478a7de99214837bef9
parent8f49f9ce8e655b221626031520e824ae458754bb
parent81522abd63c2f5c6eda9ae3166367673f81c03a0
Merge branch 'MDL-28166' of git://github.com/timhunt/moodle