hellerbarde/sosmessenger — pull request #1 by hellerbarde (2014-03-28 10:23:36+00:00)
Title: merge origin master back in

See title