Merge branch 'MDL-25763_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 02:53:56 +0000 (15:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 02:53:56 +0000 (15:53 +1300)
commitb52e55bb47a21fbb68fe400ce03273d895dcc45d
tree67d734b3613abc50eefac17b369903d39fef368e
parent6d84f28553f118c2064a748194650f37e01f7128
parent06bb6478fd138d747a077fe92a8c69284d4380f8
Merge branch 'MDL-25763_master' of git://github.com/dmonllao/moodle