Merge branch 'master' of git://repo.or.cz/tennix
commitb39487bff6d6d7e639459ead3f7e6c831eb9cb5c
authorThomas Perl <thp@perli.net>
Tue, 4 Aug 2009 13:06:25 +0000 (4 15:06 +0200)
committerThomas Perl <thp@perli.net>
Tue, 4 Aug 2009 13:06:25 +0000 (4 15:06 +0200)
tree57bd30a1f7403667ee5948641761efe0db9f2dff
parentec4ccf60ffad53c56c2e5301ab11c1e60104469a
parent346bc39b36edb00e0dd724dc2d61107e0f7e4ee9
Merge branch 'master' of git://repo.or.cz/tennix
makefile