Merge branch 'master' of github.com:DTVD/rainbowstream
authorOrakaro <nhatminh_179@hotmail.com>
Mon, 28 Jul 2014 00:27:48 +0000 (09:27 +0900)
committerOrakaro <nhatminh_179@hotmail.com>
Mon, 28 Jul 2014 00:27:48 +0000 (09:27 +0900)

Trivial merge