chiark / gitweb /
Merge remote branch 'upstream/master'
authorIvo Ugrina <ivo@iugrina.com>
Fri, 7 Oct 2011 23:20:32 +0000 (01:20 +0200)
committerIvo Ugrina <ivo@iugrina.com>
Fri, 7 Oct 2011 23:20:32 +0000 (01:20 +0200)
commit1579ca76bad785aaf2f7f500e36da362bee40b22
treec7cb2715bf189e265532036c03b19d02f4b3a6bb
parent4a4c7055db34b110f56664f5a7ecfec30121a184
parent87e7d42b2faf2a75c59213c2443ce1c9ffb00228
Merge remote branch 'upstream/master'