upstream/1.1+0.20140625

Tatsuya Kinoshita

@tats

b6e578cf · Imported Upstream version 1.1+0.20140625 · Aug 24, 2014

Upstream version 1.1+0.20140625