Merge branch 'MDL-25672' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 19:45:53 +0000 (20:45 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 19:45:53 +0000 (20:45 +0100)
commit5cfe8aecb8b78e343ded38ba9e7a0a859887d21c
tree3c74c6f2b1a432f37ee4d0edc30a5b293ed8935c
parent295710b06913d9109ca5f33e0d37659d50118e16
parent5dd7e903ff1698dcf2b6bbd821c31720d169fb83
Merge branch 'MDL-25672' of git://github.com/samhemelryk/moodle