Merge branch 'MDL-26177' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 08:36:15 +0000 (09:36 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 08:36:15 +0000 (09:36 +0100)
commitbee34e2b6deb6bb85d2310d1d747fec70be25e6a
treee3ab794338295263a701a92f499ee4b629aa10ba
parentd44d6448db1c98bb67d5ad4b9a5d08b61a5d8889
parent25f44c72bdf3b524cda704ab02d380a5fded69b5
Merge branch 'MDL-26177' of git://github.com/timhunt/moodle