# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: robertc@robertcollins.net-20080717114629-\ # 48w6aghlwowqz71m # target_branch: file:///home/robertc/archives/squid/trunk/ # testament_sha1: 896240103f913257ed9c3a1dbaf4c1a1b18a3d19 # timestamp: 2008-07-17 21:47:05 +1000 # base_revision_id: squid3@treenet.co.nz-20080716125420-\ # hk3apzgasi4uyip4 # # Begin patch === modified file 'CREDITS' --- CREDITS 2008-06-30 10:57:35 +0000 +++ CREDITS 2008-07-17 11:46:29 +0000 @@ -382,3 +382,5 @@ squid under the same conditions as the main squid application. ============================================================================== + +Woo. # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbeVSEAAAVjfgAAQUWP//14g HIC////wUAM273VHeaT1QEkpT9U9T1PamJqHlHk0Y1JtQNDIMgBKJAaU2U/EjUbQgYT1NGAAQGky JNA9TygGhkNHqAAGgNBkpk0mCaaG1GjINA0AAABJQmmRqYAphqmynlGeqaekD1HqD1PR896nyN20 dfjRgqNVaoRRAMFWuujlO4ukVV37DnHLFIiGa2cY+yv3Mwfoy6qAc906WuGRJGqfAEZuQELcwjzC MdPxYCsGaAx9kGRTrC+SsyRCSsied1rCEhqKnM3CN+I0sJjZMI5doiJikZw01IY+RrqKRdThWvN7 lqPzkKwRqXmsEubmlHDGkoj60kEHhNAjKaIPVRQQLUE48MiceMa9xO8jZRJcVgWHkcK7Y5daXqQS AxEdWJMWENX6RngWpRZMWpPU/sKlgyTC01FZEgYEKC9YirGymMMR5PtTsRVDaEqEHxF6EzriKNwO dfG8mEOtiRHFA8hAe20YdpiwWA8VFg0v3tmIFpIkUmprJ7VgmOeUCf5nlzGsF6sErxYYDnU1cDJJ ug1bUWYiUaQImyk1gCh4izmnmiiLjxjrloTA1HlTWRBsKjUSGUddrpS0LxeM5I6xY86NyduWUDWZ iciKDBJcj9Fi1mdLzpNv71VSjeCkS2ZVVk9dw4cqV6j14jsx4czmWbDxJGtpj7+LW2ndpyGIZ8Dm gZqixzguJmL5mvIG1get6iR/XUz3GhJdYZaSojasQ8DFydPhv1FBaPPeD5mUk3QsQX1ZizIGQ0W8 WpZTqRVoHcHmBgml3UKeQHbJz6kGa3gSPdNQ3E+CsB645mxkQN2gGW3N8hfoW5RNjYRLYiZSHVAB oWoBW0moqkQAOFEIQqNLrSi+tiS6PAmA5dx6OIU0rzcpfwVCwuyyxUxmRCndB4I0zNFAFkFay+BQ 40SmlhEOW3GhVA+84fjBWU/FSnvCKAiwYtGvGpNaMZcf41hEtU2wB06lVAoIsGobm4R6cZPPobnQ EnS6+BG+ccQC9WJlwwexNaaYBwhu6L70LEDmcRWitF0eFeDGM2+CuJK4WvAzVPsLuSKcKEhbyqQg AA==