chiark / gitweb /
Merge remote-tracking branch 'upstream/master'
authorIlya Kulakov <kulakov.ilya@gmail.com>
Thu, 7 Mar 2013 04:20:47 +0000 (11:20 +0700)
committerIlya Kulakov <kulakov.ilya@gmail.com>
Thu, 7 Mar 2013 04:20:47 +0000 (11:20 +0700)

Trivial merge