Merge branch '2.x-stable'
authorMarius Mathiesen <marius@gitorious.org>
Fri, 18 Jan 2013 09:30:00 +0000 (10:30 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 18 Jan 2013 09:30:00 +0000 (10:30 +0100)
commit523dbe5f0e7924f1ae17bf61d3e5546559b05ad8
tree9a618e310e6a3f38f9d8e060fa36480b85d6ab2a
parent5ce56a5259e288042a4a458520773dd7f7d32587
parent91a24c70073a770edf91b73790cb38492fd7d6f6
Merge branch '2.x-stable'