Bug 825891 - Remove one more obsolete mention of per-client randomization. r=dcamp
Bug 826979 - jsfriendapi.h conflict with qobjectdefs.h slots defines. r=glandium

--HG--
extra : rebase_source : d30852a09858b4f6d62fee627c0dc08ef765dcd8