From e4443b72f796bca462dffa3e3c5f854eaf38954a Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 22 Jan 2010 07:23:14 +0000
Subject: [PATCH] Remove svn:ignore properties which were accidentally added in
 the merge. Props jamescollins. Fixes #11960

git-svn-id: http://svn.automattic.com/wordpress/trunk@12793 1a063a9b-81f0-0310-95a4-ce76da25c4cd