Merge branch 'mika/0.9.34'
authorMichael Prokop <mika@grml.org>
Thu, 18 Aug 2011 16:58:11 +0000 (18:58 +0200)
committerMichael Prokop <mika@grml.org>
Thu, 18 Aug 2011 16:58:11 +0000 (18:58 +0200)
commit372cd7a591f40f0170d1f1486bf671531397f699
tree5c075e215288c1375807333fc562a38b801f770d
parent287dd5583fa8076026530f7ad0e875b9ebfbd90c
parentfdb81b19284e68b0397392ac4fa44edcbef3988f
Merge branch 'mika/0.9.34'