Merge branch 'w51_MDL-37233_m23_skype' of git://github.com/skodak/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 03:34:55 +0000 (11:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 03:34:55 +0000 (11:34 +0800)

Trivial merge