chiark / gitweb /
Merge remote-tracking branch 'upstream/master'
authorIlya Kulakov <kulakov.ilya@gmail.com>
Sat, 9 Mar 2013 08:58:48 +0000 (15:58 +0700)
committerIlya Kulakov <kulakov.ilya@gmail.com>
Sat, 9 Mar 2013 08:58:48 +0000 (15:58 +0700)

Trivial merge