commit df6d093451b4f6863b2cacfafdf944037229f3c2
Merge: a9c8cf9 b33edbd
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Thu Mar 17 17:06:04 2011 +0100

    Merge branch 'adrien'

commit b33edbdf8fa8c07bdf714c3c1eb04818ef521427
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Thu Mar 17 17:05:53 2011 +0100

    add credit card type discover

commit a9c8cf9a9f19156a5f978b2400547600df135aee
Merge: ecdf0ca 521dbad
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Thu Mar 17 16:42:16 2011 +0100

    Merge branch 'adrien'

commit 521dbad1dae346a77a79a655c5a800fe3c749efd
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Thu Mar 17 16:40:18 2011 +0100

    add amex credit card type

commit ecdf0ca2fa0db6097949c6070ef99f739b8f26cd
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Thu Mar 17 15:58:43 2011 +0100

    put paypayl in testing

commit 913085a1385785ddc35815aa3a2688b367eec5bd
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Wed Mar 16 23:06:39 2011 +0100

    ensure domain, needed for ssl certificate

commit 7420eaf616c8146b1a59af9e7f1e11ef2c464c6a
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Wed Mar 16 20:59:26 2011 +0100

    put paypal in production

commit f428104c2444ba4002ae35e0f68acbe6c260d5a1
Merge: baf82b0 726684d
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Wed Mar 16 20:35:13 2011 +0100

    Merge remote branch 'origin/max' into adrien

commit 726684dc1b516342376dbc43b1f0415321aa627b
Author: max-dg <maxime@david-goliath.net>
Date:   Wed Mar 16 14:51:20 2011 -0400

    Implemented Steps in CHeckout process.

commit baf82b011d9eab66816dfd143fb68dde430adc19
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Wed Mar 16 18:47:56 2011 +0100

    display 15 search results

commit ad5c5e684e49bff10c3f7a7b989f3fccd50a6796
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Wed Mar 16 11:29:44 2011 +0100

    fix number of products displaying on page collection

commit 991bf7e0e37083658f74e46338c2c514f0345a4f
Merge: 7ac9da4 55f5bee
Author: Adrien Coquio <adrien.coquio@gmail.com>
Date:   Wed Mar 16 11:12:08 2011 +0100

    Merge remote branch 'origin/max'