commit 384ae961289320846425f5256b6c2b8152acdcc5 Merge: d8ce0c6 26dc4eb Author: Sukhbir Singh sukhbir@torproject.org Date: Wed Sep 30 06:51:45 2015 -0400

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

...xed-WinIMEHandler.cpp-cross-compilatio.mozpatch | 27 ++++++++++++++++++++ projects/instantbird/config | 2 ++ 2 files changed, 29 insertions(+)