Merge http://git.einval.com/git/debian.org
authorTollef Fog Heen <tfheen@err.no>
Tue, 18 Oct 2011 14:23:45 +0000 (16:23 +0200)
committerTollef Fog Heen <tfheen@err.no>
Tue, 18 Oct 2011 14:23:45 +0000 (16:23 +0200)
commit65ddf5cf3906f9eebddea6a2370c1fab699d6849
tree3f58aebccf1566f71f16f5ef1323f1436e91d608
parent654ad8d0b689fc4a1c950bd3254c032e5192ba31
parent46c45b38c50f9a55de0144355d89442d3b3eec4a
Merge http://git.einval.com/git/debian.org

Signed-off-by: Tollef Fog Heen <tfheen@err.no>