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)
* changes:
  Message documentation for Icc8dc4ae (circular references in strip tags)
  (bug 35315) Detect circular references in strip tags

1  2 
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php

Simple merge
Simple merge