Merge branch 'master' of git://repo.or.cz/tennix
commit20120b5884d904c6d355e6b14b7971f7f8343668
authorThomas Perl <thp@perli.net>
Fri, 24 Apr 2009 08:59:23 +0000 (24 10:59 +0200)
committerThomas Perl <thp@perli.net>
Fri, 24 Apr 2009 08:59:23 +0000 (24 10:59 +0200)
tree928290cd5a0a80e7bc395dcab6f8d8a3a205ecb1
parent3d16822909ca58212dc7f923d11bcfa5e27e0958
parent7f5ae93c6b6c76a9e1deb10f81fd0ee19e49ea5d
Merge branch 'master' of git://repo.or.cz/tennix