Merge branch 'MDL-30266-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:05:45 +0000 (00:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:05:45 +0000 (00:05 +0100)
commit85e013ef79e6bc25eb45f853ffa266d4de67fbe8
treed16885b209513d1974c4342ffdd4a36b9de599fc
parent7f8dc336aab81f7d1936c3ee40b5e8f0c2038f3c
parent0c9cb1bc1997730bfcc48bd689c15fc9e0bbb7d6
Merge branch 'MDL-30266-master' of git://github.com/sammarshallou/moodle