~facundo/encuentro/make-it-work-again

Viewing all changes in revision 207.

  • Committer: Facundo Batista
  • Date: 2014-04-26 02:11:40 UTC
  • Revision ID: facundo@taniquetil.com.ar-20140426021140-02mq02cf2m6u7af2
Do the merge correctly from v1.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: