Merge remote branch 'origin/next-magent-mailer' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 6 Nov 2010 20:15:15 +0000 (15:15 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 6 Nov 2010 20:15:15 +0000 (15:15 -0500)
commit0b8608fe7537e01976f2d0364dca12fe531ce262
tree8da8849ab8caa17871d24b4a5c29e49e84f19576
parent9f8f6321ee595d7ca183c1ffdf57230db8351fb7
parentb7069eaae293583c9b6934d3a00dfa9b115b3c2a
Merge remote branch 'origin/next-magent-mailer' into next

Conflicts:
Gemfile.lock
Gemfile.lock