Merge from git-svn r115 to master branch

Conflicts:
	talk/libjingle.scons
	talk/main.scons
	talk/site_scons/talk.py

Change-Id: I173ec93b4b4a7aca68663dc756101325f280abf4
tree: c96ed05500f1575677220146778471693ef278ae
  1. AUTHORS
  2. CHANGELOG
  3. COPYING
  4. README
  5. codereview.settings
  6. talk/