Merge remote-tracking branch 'githubmirror/master'
authormh <mh@immerda.ch>
Fri, 25 Jan 2013 09:59:18 +0000 (10:59 +0100)
committermh <mh@immerda.ch>
Fri, 25 Jan 2013 09:59:18 +0000 (10:59 +0100)
commitd17d75fa093bbb9c38eb402ee842fb00c8e54cd3
tree518d9d1b2a93bbaf9577b93fe31ab3eae6717717
parent9951a642a0393b95e73acb89162d233b6a00317a
parentdeddf58be90f76cd5ecc52808455e78d72d859d1
Merge remote-tracking branch 'githubmirror/master'