Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Update README.md
WUI/API/rules: 不具合の修正
Merge branch 'master' of github.com:kanreisa/Chinachu
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Merge remote-tracking branch 'origin/devel-beta'
Chinachu/issues/84 ライブ視聴時にXSPF形式を選択できるように
Merge pull request #98 from toriimiyukki/fix-84

WUI/Client/channel/watch: ライブ視聴時にXSPF形式を選択できるように fixes #84