commit 5cc7da95acee577b8ec633cad4e489639349c109 Merge: 49c0420 6ce1187 Author: Sukhbir Singh sukhbir@torproject.org Date: Fri Apr 24 00:01:48 2015 -0400

Merge branch 'master' of git-rw.torproject.org:tor-messenger-build

projects/binutils/config | 4 ++-- projects/instantbird/config | 6 +++--- projects/libgcrypt/config | 6 +++--- projects/libgpg-error/config | 6 +++--- projects/libotr/config | 6 +++--- projects/mingw-w64/config | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-)