tree 3caf96a6cb8496a131a3b22ba3d1052c55324584
parent 7ee04f093aac1494609272f84a5f1fded1d4c756
parent 15b2de231fb5541ef21aa0c9794e2b02a910a1f7
author Jeff Muizelaar <jmuizelaar@mozilla.com> 1350328037 -0400
committer Jeff Muizelaar <jmuizelaar@mozilla.com> 1350328037 -0400

Merge branch 'master' into v4

Conflicts:
	qcmsint.h