Merge remote-tracking branch 'jlentfer/foomatic' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Jun 2012 18:27:19 +0000 (20:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Jun 2012 18:27:19 +0000 (20:27 +0200)
commitdf106d88e5a7eeafb9298b0febbe02e9a349728f
treec181169d01c469ee6c1a027429e993917f49f03e
parente659ba5b3aba411d7155665e5fe4d5dd03e026b8
parent477e28cf0d33a4a97825ec554ed6e969dbba7e0b
Merge remote-tracking branch 'jlentfer/foomatic' into next