Merge branch 'w21_MDL-27575_m23_skype' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:44:47 +0000 (10:44 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:44:47 +0000 (10:44 +0800)

Trivial merge