[livejournal] r17218: Commit property svn:mergeinfo changes

_U  branches/r69/

Property changes on: branches/r69
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/oauth:16278-17088
/trunk:17198-17199,17201,17203-17204
   + /branches/oauth:16278-17088
/trunk:17198-17199,17201,17203-17204,17208-17211,17213,17216