Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 19:54:33 +0000 (08:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 19:54:33 +0000 (08:54 +1300)
commit2b88fa0c90f17a11a990f286194a42a38fd9b369
treefdbec52ba78ea2b7a4af23d9ecf1b80c00afb9d7
parentbb4551334fb3a3312bab9bbc3f9556891e9a677c
parentc476e67839d75d27e22758e3de870d7946dbc4f1
Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle