tree c96ed05500f1575677220146778471693ef278ae
parent 343b7727ff058489ea7f866c12fd2e2bd4d525d0
parent 1370d87a66440cf4938329418716fc93be6c6446
author Chung-Cheng Lou <roylou@google.com> 1331006033 -0800
committer Chung-Cheng Lou <roylou@google.com> 1331006033 -0800

Merge from git-svn r115 to master branch

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

Change-Id: I173ec93b4b4a7aca68663dc756101325f280abf4