Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 10 Jul 2014 01:57:06 +0000 (09:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 10 Jul 2014 01:57:06 +0000 (09:57 +0800)
Conflicts:
lib/graphlib.php


Trivial merge