# git log origin/articledisplay..articledisplay

commit 4acad322ee34b15d158a7c3073e5f42707a83258
Merge: d434536... 6bfaa9e...
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Sat Jul 25 13:52:46 2009 -0700

    Merge branch 'rc20090729' into articledisplay

commit 6bfaa9eacb2dc92cafea5eab4b66d140d2e629fa
Merge: bada9f7... 12a0be4...
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Sat Jul 25 13:52:35 2009 -0700

    Merge branch 'master' into rc20090729

commit 12a0be412aa8ee035fa89c494ac9c15fb40cdd85
Merge: 117be7a... 7ddfadc...
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Sat Jul 25 13:52:32 2009 -0700

    Merge branch 'release'

commit 117be7a0d9bfc031575492dc59a49fa33c8ec813
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Sat Jul 25 13:14:02 2009 -0700

    if not using getty images on a blank query, reduce total items from 300 to 130, logging getty errors if response_status is not success

commit 67cafbe3b2595ccd6da96dd14a7d155f96a49296
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Sat Jul 25 12:33:39 2009 -0700

    getty images : add spec, good enough to change code

commit bada9f767c496956cf10fee4db968a9d0bd0a3d1
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Sat Jul 25 11:49:41 2009 -0700

    1619 Dev Data Dump Request

commit 5143f4a4c906838836376ae1c63ad72f9f9ca1f3
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Sat Jul 25 11:49:41 2009 -0700

    1619 Dev Data Dump Request

commit 1c55fb9cd52eea367f40c81a82d03b2bf1b009e1
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Sat Jul 25 11:49:08 2009 -0700

    getty images : add spec for uploads controller

commit d434536b889ef16095c15505a35fa0276ea61f64
Merge: 0bfdc26... 65687a4...
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Sat Jul 25 11:06:20 2009 -0700

    Merge branch 'articledisplay' of git@github.com:br/breport into articledisplay

    Conflicts:
        lib/tasks/br.rake

commit 65687a476e11268a5715fe599711105ab9c2f34d
Author: Sam Parnell <samparnell@gmail.com>
Date:   Sat Jul 25 08:59:36 2009 -0700

    Added switch for author articles count between slideshows and articles

commit b17302c36a92285e61f4baadef86353c0f8800c2
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Fri Jul 24 23:35:58 2009 -0700

    getty images : add Asset.search_for_full_response so we can grab error code

commit 7ddfadc32a5007976dd2138e3982368a955166cf
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Fri Jul 24 14:13:28 2009 -0700

    reduce ad refresh rate to 3 mins and 30 seconds

commit 0bfdc26f53b356d70426c9427fa66f5c7e0c6b76
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Thu Jul 23 15:41:05 2009 -0700

    update duplicate tag buster query to make it use index for effectively, per Erik from EY

commit c0a8913583a6519359b95576ed254070032d78c9
Author: Tung Nguyen <tongueroo@gmail.com>
Date:   Thu Jul 23 15:39:22 2009 -0700

    do not run duplicate tag remover on staging