Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Jun 2012 11:15:38 +0000 (13:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Jun 2012 11:15:38 +0000 (13:15 +0200)
commit40fc4221d8e65e2d59eebded7de70f19a13aecbc
tree26cee8c247f73f168ffabe50f5040338b2dc2fef
parentdaf84637b91cf64fae36c79975db9fdc22128459
parent9eca7db9e15a738a310feabb55f72bc26adc0fe4
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
usbutils/usbutils.nm
usbutils/usbutils.nm