Merge remote-tracking branch 'itseezstream/master'
authorOzan Tonkal <ozantonkal@gmail.com>
Tue, 17 Sep 2013 15:50:14 +0000 (17:50 +0200)
committerOzan Tonkal <ozantonkal@gmail.com>
Tue, 17 Sep 2013 15:50:14 +0000 (17:50 +0200)

Trivial merge