Merge branch 'master' of git://winexe.git.sourceforge.net/gitroot/winexe/winexe-waf master
authorJelmer Vernooij <jelmer@samba.org>
Tue, 11 Oct 2011 22:49:16 +0000 (00:49 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 11 Oct 2011 22:49:16 +0000 (00:49 +0200)
commitb5cf1bc9817acd21b88d6edeec0c007083402b37
tree070fede33802026c48f9ff45e7a9c48810065eca
parentefa05f49354240c563e2662ee53267f92f8cf088
parent09ba5f4d132f2d1cf6b445e4f25d2351169e26db
Merge branch 'master' of git://winexe.git.sourceforge.net/gitroot/winexe/winexe-waf

Conflicts:
source/wscript
source/wscript