[ljcom] r12890: Reverse-merged /trunk:r12887

_U  branches/r98.3/

Property changes on: branches/r98.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/faq-refactor:12682-12702
/branches/mobile:10279-10711
/branches/oauth:8215-9310
/trunk:12762-12774,12776-12787,12790,12793-12795,12797-12805,12807,12809-12812,12818-12819,12821,12825-12826,12830-12831,12833-12835,12837-12841,12843-12844,12846-12847,12850-12852,12855,12862,12868,12878,12887
   + /branches/faq-refactor:12682-12702
/branches/mobile:10279-10711
/branches/oauth:8215-9310
/trunk:12762-12774,12776-12787,12790,12793-12795,12797-12805,12807,12809-12812,12818-12819,12821,12825-12826,12830-12831,12833-12835,12837-12841,12843-12844,12846-12847,12850-12852,12855,12862,12868,12878