Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Thu, 14 Jul 2011 21:04:51 +0000 (23:04 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 14 Jul 2011 21:04:51 +0000 (23:04 +0200)
commit673f74178cbf025b3b3a644dfab2ab3d286cd61c
tree83ac12837c374768dd9c0675b3e229f07fecc4c0
parent7a472e9e0cc42b8147e175263961cb9451e9a72a
parent4cb390b977817693b19f8bfc40989e3903de82cf
Merge branch 'master' into gregoa