Merge branch 'MDL-44606-master' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 06:18:13 +0000 (14:18 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 06:18:13 +0000 (14:18 +0800)
commit5140fac5da8b4c70d940636c79a9b4072328709d
treeac42dccb6c38012d06ab0d47ce236a2824f7dfdb
parentb6cb3a43245644868fd8c78f8e58a9c436ce0de9
parent0cd720fe512d48c2af81fc054c042c9c63e8a234
Merge branch 'MDL-44606-master' of github.com/damyon/moodle