Merge branch '2.x-stable' master v2.4.11
authorMarius Mathiesen <marius@gitorious.org>
Wed, 6 Mar 2013 08:59:44 +0000 (09:59 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Wed, 6 Mar 2013 08:59:44 +0000 (09:59 +0100)
commit6408eb5129b45cc4342bf0fddc095dc2387170fe
tree8021a8be41f26f9aed1e1644037671846aac9624
parentaa805129659dd2737c36b39086af7fe867fe6140
parent1dc69a908cf1f0481e30b34b5703563880c551b7
Merge branch '2.x-stable'