Merge branch 'MDL-31153-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 23:57:25 +0000 (00:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 23:57:25 +0000 (00:57 +0100)
commit28f7043f61b6b2f0d0ffb2cb665664a59e085ff0
tree4e1ccd48e2e28015f2f3ccf27d0595613f4320f1
parent2def471913b46eed065e07cfaf4f4cc25d0832b0
parentea47046689d6d762d3358c3fae2dea742824d997
Merge branch 'MDL-31153-master' of git://github.com/sammarshallou/moodle