Merge branch 'MDL-42923' of git://github.com/jleyva/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 02:26:22 +0000 (10:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 02:26:22 +0000 (10:26 +0800)
commitb33fbd428ed35dd29a4841d09d8721c7dfc66591
tree3483b452cae45ead5bc5b6a996199268c978e6a4
parent305b15f4ab505a48fa66e7226c25de57afc92127
parentcb9d8257542439f08b2fc522d8af50d65ed7c951
Merge branch 'MDL-42923' of git://github.com/jleyva/moodle

Conflicts:
version.php
version.php