tree e29ce457ec760bdf7d7bcf2324fd164c6ec5d0b9
parent ff46c9361512be430b2aea0e8e11b51c2b9671b5
parent c93476e98e14c355eb5c924308c9750493548104
author Vitaly Buka <vitalybuka@google.com> 1454713099 -0800
committer Vitaly Buka <vitalybuka@google.com> 1454713142 -0800

Merge remote-tracking branch 'weave/master' into 'weave/dev'

c93476e libevhtp requires libevent-dev
3b8fbc5 Add customizable settings option for xmpp_endpoint
15888c7 cmake is used to build gtest and libevhtp

Change-Id: I67d276f1ec3d97c39ffabedc6318272c7c1c0cc3