chiark / gitweb /
Merge remote-tracking branch 'upstream/master'
authorIlya Kulakov <kulakov.ilya@gmail.com>
Fri, 7 Dec 2012 07:48:25 +0000 (14:48 +0700)
committerIlya Kulakov <kulakov.ilya@gmail.com>
Fri, 7 Dec 2012 07:48:25 +0000 (14:48 +0700)
commitf42ee83bc74883810b310fcce4a336b3e7ff23d9
tree45ee72a538be75a3d683d9f2af75fcab2af80570
parentfbe29005c764e006027c4258a16d2358728ab209
parentc7e497c1c8900f341631c2c94584cd951d0cd3b9
Merge remote-tracking branch 'upstream/master'