Merge branch 'wip-MDL-25870-master' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 12:57:02 +0000 (14:57 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 12:57:02 +0000 (14:57 +0200)
commitb0d6fa17a4401cf027be4333c0d3a2404c283aa8
tree1765b7e0ad93ae49bc8667db921b0e6d682ee96c
parentc1d251e890b048025347ece0137ac3be16db19d4
parentb8746370254d44767cb588388a104e737af8d335
Merge branch 'wip-MDL-25870-master' of git://github.com/samhemelryk/moodle