Merge branch 'MDL-34612-master' of https://github.com/mackensen/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:12:57 +0000 (14:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:12:57 +0000 (14:12 +0800)
commit031a28ce7f0abb1e47395f0c7e4284b6874137b7
treecd5f2e3d21936e6d3a544f4978ed1f41cb1ce5a0
parente6338c2c65019fee71d4321e3fe569e78b6cb21d
parent3ed2c6e50cfe51b004397e655f0481473092c02b
Merge branch 'MDL-34612-master' of https://github.com/mackensen/moodle