Merge branch 'master' of github.com:DTVD/rainbowstream
authorOrakaro <nhatminh_179@hotmail.com>
Sat, 10 May 2014 17:29:59 +0000 (02:29 +0900)
committerOrakaro <nhatminh_179@hotmail.com>
Sat, 10 May 2014 17:29:59 +0000 (02:29 +0900)

Trivial merge