# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: henrik@henriknordstrom.net-20080302132621-\ # 3ujtv9ey18c1yiiw # target_branch: file:///data/bzr/squid3/trunk/ # testament_sha1: 7178857878c79f284b96e3357c4509f1cc2e2e39 # timestamp: 2008-03-02 19:47:01 +0100 # base_revision_id: henrik@henriknordstrom.net-20080302124342-\ # ja0aovmezpqa523u # # Begin patch === modified file 'README' --- README 2008-03-02 12:43:42 +0000 +++ README 2008-03-02 13:26:21 +0000 @@ -26,6 +26,6 @@ squid-bugs@squid-cache.org # bugs and fixes squid@squid-cache.org # other feedback -ggg +ggg ggg aaa bbb # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT+/PxkAAsxfgAAQUWP//3ZD EAC////wUAUedAAAAAAGA0AAA0AAAAAAwGgAAGgAAAAADVT9TRNMBMExGCMCYjQwTIMBoAABoAAA AAAVKECaAAgCZNJpk9E0aNMmjN8N1est/Hq3fhQuvTAomSkupXpspayTj0rjyVYOnVhnh/DLhHxX KFH874/yzBfRVkvzqsrd/LIeQcmNhe6RgDDM4ewQIhuHFRU/6xOHAyLQsZIt/SeO1ufd+pLrtrmu kOx5Tv7D8H/FPbMCNabkbZyNf2byuGHYkbI8fDbWtf2HPnVobMkZ6V1rn2bZE2EWKo8HMii5Z15S 9oXKGLpWSMV7zZGX2M27DPTrkUktVas79C4vR5PQpUp9OGGPsz6MkY02G9Rbkzevu7E9SuxU9jQd HB7+brTF00KXYly4oJvlibpv4p2JLyiXlSqS4txcSppamKLYJqXrUUkxclxrZuxldpLkjS3OemRt ZnTaW62brYRfZRZVYscU1aIuV+7anRiZKOfmb1WTGmhzUztNttRzLmtqZ7iqMafvemo1quTJjqo1 zvlZxlNWnWwOKNqOBt0aJvs5HFdyw5Jbo38l7kpGay9pZtyZrNTFpaBRgzXM3b0e3/fwZYtbXYjs aXDC6bHCje2t/cyXqJp0qJZZtRrmrJdQ1O7NoO3tvYz8pVfSUWr1NlEulTgl3UbJMMOs+XxoWUJ8 1I/LwMC96LK0dVafCkpQ4vqe96rMVS7BVZc1pHza7qSiUV/t93+rsX3cPVZqkzhSavPjuUn6FjzU O56LPedTxXu97jb7fnm8b3CM288ZPlyOKz2meaLI/iMEfHg9rg4viqqqo9zUs5tU8ZPgwTk3P1dH 6v64OmFHk190zctlMV9/zm9taY5NCbHNc0tkMF7VwOJU8Z07BPn+7uKMuqjxrWnyR5N7E+h24nkz XSemsvW+nndOpunp+GgkbkwR279j1y6x3HE+tHNIzQyTsS5Ok+lnsdq54vBR4ODL3qd5ZuM0fV5v e4UT9HkatkjlYxw+Vf8e1l5Ir3DT9n9P2KWlaSqsp+Ei00uaNrWlI8KRwfmFjqP5S9JGKXHHsk0f 71qrmU4Ifoh5u9LP2+h9CvkfNMHdOdUj0nSSqRmniVTz06GPk1PKE7I7TI8XU0nI5MmDGeBhch1H NGC6S590iu9v9Y70jiRL6Ionj1x8eV00orCdqyHq2ouh5SfloSM4zuTPec3Hrdbol0mA/vRz3GTI o77zTyNEn1dSKiYve8pijN6N7BSS0zvRTDkkjRHGcqJF2wYF9C6qeHiey9eUU84640HehRcl8dZR fJoEpsskew0HwaV5/xcozcS9t8SxhJxkoJWpaibm1LHu3UhyWy7ZqTYjNN6Gs8zxnSbU54JqZqKp VV8kwntLaspin/i7kinChIH9+fjI