chiark / gitweb /
Merge remote branch 'upstream/master'
authorIvo Ugrina <ivo@iugrina.com>
Mon, 26 Sep 2011 10:29:39 +0000 (12:29 +0200)
committerIvo Ugrina <ivo@iugrina.com>
Mon, 26 Sep 2011 10:29:39 +0000 (12:29 +0200)
commitfd877d0d39dd1e245b44dce81876e40a46281d4a
tree73fe7f7346df6c8735146caa367eb36579edb4a0
parent7f64ad973ad339a4c5976a9265a0ae1e9df6537c
parent00788adb0b740e1d19870c5497dee9c9fc3ffc63
Merge remote branch 'upstream/master'