Merge branch 'wip-mdl-29844' of git://github.com/rajeshtaneja/moodle.git - resolved...
authorAparup Banerjee <aparup@moodle.com>
Tue, 3 Jan 2012 04:29:12 +0000 (12:29 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 3 Jan 2012 04:29:12 +0000 (12:29 +0800)
commitd7ca9b68cad454f8bd83057efe0e4d2190323328
tree18e1a3b8fff15411e1271bccd7c6e6c9ada75c0e
parent44141b188159fc21f973eaa0b3e7173817dd7c84
parent90911c4ff98dc2078a3acef5ddf5a1a8f7e20ba5
Merge branch 'wip-mdl-29844' of git://github.com/rajeshtaneja/moodle.git - resolved conflict
lang/en/admin.php
version.php