Restore branch-1.8-merged on 11

This was accidentally deleted during a merge.


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/11@378337 f38db490-d61c-443f-a65b-d21fe96a405b