Merge branch 'MDL-30484' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 16:16:04 +0000 (17:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 16:16:04 +0000 (17:16 +0100)
commit7ce92ac1ad95c0ed4d4a8681673db08700d9cfa7
tree3416a440a87c063cc70a3054a057d7db712891ba
parentade31f5f4ffc1ae7c5a5ceeb4f70ff9e650028f5
parent94815ccfa0895e27a2bb2c22e450c3e6074c623b
Merge branch 'MDL-30484' of git://github.com/timhunt/moodle