Merge remote-tracking branch 'githubmirror/master' into HEAD
authormh <mh@immerda.ch>
Sat, 19 Jan 2013 12:06:27 +0000 (13:06 +0100)
committermh <mh@immerda.ch>
Sat, 19 Jan 2013 12:06:27 +0000 (13:06 +0100)
commit9951a642a0393b95e73acb89162d233b6a00317a
tree33db5ce4fa976075f059b80c93dfb5e0d5c6370e
parentbee292c51a392fc36948862f88585d41aaf68c65
parent06983bff6ae91dc576e06e7d467ce248abb9ca23
Merge remote-tracking branch 'githubmirror/master' into HEAD