Merge changes Ic19071c7,Icc8dc4ae
authorAaron Schulz <aschulz@wikimedia.org>
Tue, 8 May 2012 22:54:59 +0000 (22:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 May 2012 22:54:59 +0000 (22:54 +0000)
commit7f04814796855df90816087a60a5c8b1759ff609
tree5ba13507397864595ca8f7af999f12ed4237305d
parent0a52f6ed4a04852c5794b880755410be8622a82a
parenta3d668760546f300040c578a8d4f93dc4528d68c
Merge changes Ic19071c7,Icc8dc4ae

* changes:
  Message documentation for Icc8dc4ae (circular references in strip tags)
  (bug 35315) Detect circular references in strip tags
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php