[tor-commits] [torbrowser/maint-2.2] Merge branch 'maint-2.2', remote-tracking branch 'shondoit/fix-unpack-source' into maint-2.2

[erinn at torproject.org]

commit f4a85c4c2afe8dff254e5e5cf625cdbb67ada1f3
Merge: dd611d8 9c42b14
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri May 4 18:58:15 2012 -0300

    Merge branch 'maint-2.2', remote-tracking branch 'shondoit/fix-unpack-source' into maint-2.2

 build-scripts/versions.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)