Permalink
Browse files

Merge remote-tracking branch 'lavrin/master'

Conflicts:
	doc/user_manual.html
  • Loading branch information...
nniclausse committed Sep 14, 2011
2 parents 82eb449 + 9c86aff commit a5156e7bb4bb658da25d0f1190eaaf782b890fa5
Showing with 238 additions and 119 deletions.
  1. +131 −118 doc/user_manual.html
  2. +15 −1 doc/user_manual.tex
  3. +58 −0 examples/jabber_privacy.xml.in
  4. +34 −0 src/tsung/ts_jabber_common.erl
Oops, something went wrong.

0 comments on commit a5156e7

Please sign in to comment.