Merge branch 'MDL-41071-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 08:01:12 +0000 (16:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 08:01:12 +0000 (16:01 +0800)
commita446d62d977c133f18e23d7be7c3747408bd84cc
tree44da3536271d5c77db7e82e2585400fcad8eac20
parent9e2d9135f606bbcb67d52406bf5aad947421a02b
parentcbb3990bcb1ed9a35cea79c87d0a5c5f133ebe80
Merge branch 'MDL-41071-master' of git://github.com/FMCorz/moodle