Merge branch 'master' into verbose-rewrite
authorDaniel Martí <mvdan@mvdan.cc>
Sun, 3 Nov 2013 10:53:36 +0000 (11:53 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Sun, 3 Nov 2013 10:53:36 +0000 (11:53 +0100)
commit223b0ea061f81a157b99bf2c76cebad32e25a8c4
treeb8eb7aab72e8db606454933242ba57f3c964b75f
parent070feb3d219f54b69f19cf71eb173121c287cc09
parent19ef29ed15dde28c53673e26fa4fa19a5cde9cb4
Merge branch 'master' into verbose-rewrite