Merge branch 'MDL-28620' of git://github.com/jbrisland/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 8 Aug 2011 13:32:29 +0000 (15:32 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 8 Aug 2011 13:32:29 +0000 (15:32 +0200)
commit260cf4c2fdc6032ff9aefccea603afa7d8bd3b12
treea91eef63d35f895f8be7ef2032d31144b8f61473
parent0d5e5644b849965713caa51ec59212ad6e3bf2fa
parenta8b2690bff410ccd06863275b5eb33e34697787c
Merge branch 'MDL-28620' of git://github.com/jbrisland/moodle