Removed svn:mergeinfo properties from trunk.
Authored by: jplang 2013-11-11
Parent: [r12268]
Child: [r12270]