Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 02:16:54 +0000 (15:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 02:16:54 +0000 (15:16 +1300)
commit002ee6faab6c0105d343206c6d60477f86585048
treee887df21bce04387b166bc06c60fc8071d9cb89f
parent4e45c0319c75ded9ff7d233a519d9b5d2ee17cdd
parentc87b87e62fdf83e6ee82dbec2d1d7a62ffe4ac36
Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle