0000000000000000000000000000000000000000 175c40e8e5109bdb233314d88b90a00a7f15376b Didier Raboud <odyx@debian.org> 1354792276 +0100	branch: Created from refs/remotes/origin/master-squeeze
175c40e8e5109bdb233314d88b90a00a7f15376b 20169da83e3ba3cdc2ef53d98ea001726978534e Didier Raboud <odyx@debian.org> 1354792298 +0100	cherry-pick: Backport upstream configuration files split to address CVE-2012-5519.
20169da83e3ba3cdc2ef53d98ea001726978534e 5c919bc3d5579f9312fbc239ab9ac761e46dd5df Didier Raboud <odyx@debian.org> 1354792320 +0100	commit (amend): Backport upstream configuration files split to address CVE-2012-5519.
5c919bc3d5579f9312fbc239ab9ac761e46dd5df c87058b020ed95a300cd9bed26e3b0536ca84035 Didier Raboud <odyx@debian.org> 1354792383 +0100	commit (amend): Backport upstream configuration files split to address CVE-2012-5519.
c87058b020ed95a300cd9bed26e3b0536ca84035 425455ed9f2d51efab053a1b2dec5be835cc7347 Didier Raboud <odyx@debian.org> 1354792399 +0100	cherry-pick: Make cupsd.conf a non-conffile, as it is managed by cups itself.
425455ed9f2d51efab053a1b2dec5be835cc7347 9d52d0f81734461c18e8a3daed55fb7483055700 Didier Raboud <odyx@debian.org> 1354792486 +0100	commit (amend): Make cupsd.conf a non-conffile, as it is managed by cups itself.
9d52d0f81734461c18e8a3daed55fb7483055700 c6d2855ed7f919ebff5d5b91a2386cbc7cd457bc Didier Raboud <odyx@debian.org> 1354792511 +0100	cherry-pick: Document changes in cups.NEWS
c6d2855ed7f919ebff5d5b91a2386cbc7cd457bc 15162ad1e6c54a754e796540e9320be2b4e9fc24 Didier Raboud <odyx@debian.org> 1354792632 +0100	commit: cups 1.4.4-7+squeeze3 Debian stable-security release.
15162ad1e6c54a754e796540e9320be2b4e9fc24 f3575713aab297ec5aa9dd771d519aabe53cca1a Didier Raboud <odyx@debian.org> 1354792658 +0100	commit (amend): cups 1.4.4-7+squeeze3 Debian stable-security release.
f3575713aab297ec5aa9dd771d519aabe53cca1a 175c40e8e5109bdb233314d88b90a00a7f15376b Didier Raboud <odyx@debian.org> 1354796751 +0100	origin/master-squeeze: updating HEAD
175c40e8e5109bdb233314d88b90a00a7f15376b 6402b2a2519fad80c0e368c44c9939300e9e93ee Didier Raboud <odyx@debian.org> 1356788757 +0100	merge 6402b2a2519fad80c0e368c44c9939300e9e93ee: Fast-forward
6402b2a2519fad80c0e368c44c9939300e9e93ee 9a2b4f0378dff123ddc26714ff87f2bffa3fb5d0 Didier Raboud <odyx@debian.org> 1357548906 +0100	commit: Ship cups-files.conf's manpage in cups
9a2b4f0378dff123ddc26714ff87f2bffa3fb5d0 9e27dcc9112f92c1fe895cf65990ce9bb655654e Didier Raboud <odyx@debian.org> 1357548995 +0100	commit: Generate translated cups-files.conf's manpage in the po4a infrastructure
9e27dcc9112f92c1fe895cf65990ce9bb655654e 7e1291de7c101cccb897c6a8a2a5f0b8822c0c6f Didier Raboud <odyx@debian.org> 1357556261 +0100	commit (amend): Generate translated cups-files.conf's manpage in the po4a infrastructure
7e1291de7c101cccb897c6a8a2a5f0b8822c0c6f 9a2b4f0378dff123ddc26714ff87f2bffa3fb5d0 Didier Raboud <odyx@debian.org> 1357564966 +0100	HEAD^: updating HEAD
9a2b4f0378dff123ddc26714ff87f2bffa3fb5d0 6402b2a2519fad80c0e368c44c9939300e9e93ee Didier Raboud <odyx@debian.org> 1357564967 +0100	HEAD^: updating HEAD
6402b2a2519fad80c0e368c44c9939300e9e93ee 5634dc5abfe13171d93fefd310e665775ca27c22 Didier Raboud <odyx@debian.org> 1357565014 +0100	cherry-pick: Ship cups-files.conf's manpage in cups
5634dc5abfe13171d93fefd310e665775ca27c22 9463e1420e19d398706a4b5f9ee19ed90ba2faa4 Didier Raboud <odyx@debian.org> 1357565172 +0100	commit (amend): Ship cups-files.conf's manpage in cups
9463e1420e19d398706a4b5f9ee19ed90ba2faa4 1886d077c7944e88a2472a558b2d87fff76de548 Didier Raboud <odyx@debian.org> 1357565235 +0100	cherry-pick: Generate translated cups-files.conf's manpage in the po4a infrastructure
1886d077c7944e88a2472a558b2d87fff76de548 8151ca7f9d757a6fc7a9ed4c3e082585b9327067 Didier Raboud <odyx@debian.org> 1357565276 +0100	commit (amend): Generate translated cups-files.conf's manpage in the po4a infrastructure
8151ca7f9d757a6fc7a9ed4c3e082585b9327067 4173f75b7ebfb387aaf90c53b70df0a9440e1292 Didier Raboud <odyx@debian.org> 1357565444 +0100	rebase finished: refs/heads/master-squeeze onto a0e4aec45458e1922263c992a8975fabe6100140
4173f75b7ebfb387aaf90c53b70df0a9440e1292 4b6e0b4cb43d922ce07eb7f69e9a9f69fe0d8dc6 Didier Raboud <odyx@debian.org> 1357896874 +0100	commit: cups 1.4.4-7+squeeze3 Debian stable release.
4b6e0b4cb43d922ce07eb7f69e9a9f69fe0d8dc6 5933a483268599e2049b84afa643248a879d3458 Didier Raboud <odyx@debian.org> 1358008369 +0100	rebase finished: refs/heads/master-squeeze onto b835ac71c6b863447cf07a0b25fea3f93847b0ce
5933a483268599e2049b84afa643248a879d3458 b835ac71c6b863447cf07a0b25fea3f93847b0ce Didier Raboud <odyx@debian.org> 1358008477 +0100	HEAD^: updating HEAD
b835ac71c6b863447cf07a0b25fea3f93847b0ce de0c5611905b7baeb41c0ebc6c76ce60d2f18a18 Didier Raboud <odyx@debian.org> 1358008482 +0100	commit: cups 1.4.4-7+squeeze3 Debian stable release.
de0c5611905b7baeb41c0ebc6c76ce60d2f18a18 b211c11829d52f26f062cd281da4691283fb08cf Didier Raboud <odyx@debian.org> 1358009227 +0100	commit (amend): cups 1.4.4-7+squeeze3 Debian stable release.
b211c11829d52f26f062cd281da4691283fb08cf ea97f72d93751eb6674901d37ef65ed41fae2683 Didier Raboud <odyx@debian.org> 1394540894 +0100	push
