Merge branch 'MDL-25722' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 19:22:26 +0000 (20:22 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 19:22:26 +0000 (20:22 +0100)
commit39e316e167162b2810a32d2dbbf22181c231e582
tree4a7586de2208f7b3d8bb7eb140165f5c14a7a593
parentc6947dd878db709db5f70d340c148106377cba86
parentc97325f6e87e86bccd652864bd28a2228afae846
Merge branch 'MDL-25722' of git://github.com/timhunt/moodle