虾米音乐回归官方外链播放器
Squashed commit of the following:

commit 830227fcb82cb9b291994bb296cf9051f616541f
Merge: 10fbd54 134c3a1
Author: perichr <i@perichr.org>
Date:   Fri Aug 22 01:29:40 2014 +0800

    Merge commit '134c3a1f8785d89da5f9b2b78752ac73bfb8ae84' into subtree/MyPlayer

commit 10fbd54fd071fc0a523810f995ef3f477ee1af5b
Merge: 383f310 c3e5d5e
Author: perichr <i@perichr.org>
Date:   Fri Aug 22 01:28:50 2014 +0800

    修改一些冲突。
    Merge branch 'master' into subtree/MyPlayer

    Conflicts:
    	MyPlayer/assets/js/perichr.js
    	MyPlayer/player/index.html

commit 134c3a1f8785d89da5f9b2b78752ac73bfb8ae84
Merge: 0b6b756 8d3e445
Author: perichr <i@perichr.org>
Date:   Fri Aug 22 01:20:26 2014 +0800

    Merge branch 'hotfix/1.1.1'

commit 8d3e445b3e4907d1718793a4ffe9f6fd154073db
Author: perichr <i@perichr.org>
Date:   Fri Aug 22 01:19:00 2014 +0800

    虾米音乐回归官方外链播放器

commit 383f3107c798d614d23853a962eab9e741aa305a
Merge: ad255a6 0b6b756
Author: perichr <i@perichr.org>
Date:   Thu Aug 21 17:40:35 2014 +0800

    Merge commit '0b6b756ef617f192b8d3ec9d0ac7c8e727c1ede9' into subtree/MyPlayer

commit 0b6b756ef617f192b8d3ec9d0ac7c8e727c1ede9
Merge: 956873b 5556de4
Author: perichr <i@perichr.org>
Date:   Thu Aug 21 16:56:50 2014 +0800

    Merge branch 'release/1.1'

commit 5556de45537b04af8a6f77ea172c67bb3f35ce45
Author: perichr <i@perichr.org>
Date:   Thu Aug 21 16:55:47 2014 +0800

    删除代理行

commit eedc3a0ca6c0412f599f2b810473adaf14bc087f
Author: perichr <i@perichr.org>
Date:   Thu Aug 21 16:47:05 2014 +0800

    perichr.js更新到1.1版本。修正一些错误。完善插入按钮功能。使用软空格做文件行缩进。

commit ad255a612499152ae9f3a5474c007edb2406bbb0
Merge: 124271b 956873b
Author: perichr <i@perichr.org>
Date:   Wed Aug 13 16:01:40 2014 +0800

    Merge commit '956873b67f27e8753a9095b6ee247bed0174638c' into subtree/MyPlayer

commit 956873b67f27e8753a9095b6ee247bed0174638c
Merge: 3553599 f57b2c5
Author: perichr <i@perichr.org>
Date:   Wed Aug 13 13:33:51 2014 +0800

    Merge branch 'release/1.0.9'

commit f57b2c516ea22d27fddf25893a9cd2b8951990b2
Author: perichr <i@perichr.org>
Date:   Wed Aug 13 13:32:58 2014 +0800

    修正一些错误。

commit 3553599eb54050c16f99a7b0e72e6d1e75b1af73
Merge: 36f7249 e17f96b
Author: perichr <i@perichr.org>
Date:   Wed Aug 13 13:26:13 2014 +0800

    Merge branch 'hotfix/1.0.8.1'

commit e17f96bbe200693751a017196d83ba6a2876f147
Author: perichr <i@perichr.org>
Date:   Wed Aug 13 13:24:25 2014 +0800

    修正音频播放器的小错误

commit 4f04a53b93014083a5d0ac3352d71b5fa22789b6
Merge: 1255c31 36f7249
Author: perichr <i@perichr.org>
Date:   Tue Aug 12 18:03:12 2014 +0800

    Merge branch 'master' of https://github.com/perichr/Typecho_Plugin_MyPlayer into develop

commit 1255c31412a5ac7fca0adc842ed6bb59320ead3c
Merge: 36673ee 83c2ce3
Author: perichr <i@perichr.org>
Date:   Tue Aug 12 02:12:17 2014 +0800

    Merge branch 'hotfix/1' into develop