Merge branch 'wip-MDL-33920-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 21:47:00 +0000 (10:47 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 21:47:00 +0000 (10:47 +1300)
commit527dd78d369b629e9956c5b7213ad31d611a6ce0
tree94fc5156c8a3ed16701c40bbfe20a98d189b70ac
parent5666a74c91c8889fd65c4a2ca16b6720247cc75c
parent4e3663365bb5e427d466e0eab2485bda78641e67
Merge branch 'wip-MDL-33920-master' of git://github.com/marinaglancy/moodle