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)
commita77e8b7b7b9080917a0ebf4051e4547c9a5202e9
tree99b1a4a6014bf7ca535857a35e9009e7e0e337d9
parent5c6c172033e3fb4afce862f8b32b459f5c35ad19
parent94e2dc1dafaa05ae0315911e033585f09e41cf01
Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle

Conflicts:
lib/graphlib.php