Merge "jquery.textSelection: re-add iframe check due to regression"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 28 Jul 2014 21:30:35 +0000 (21:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 28 Jul 2014 21:30:35 +0000 (21:30 +0000)

Trivial merge