Merge branch '2.x-stable' master
authorMarius Mathiesen <marius@gitorious.org>
Wed, 9 Jan 2013 09:00:08 +0000 (10:00 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Wed, 9 Jan 2013 09:00:08 +0000 (10:00 +0100)
commit5ce56a5259e288042a4a458520773dd7f7d32587
tree43cc2fcb03f5d7ec93a0b12702c35bbb696ae1da
parent7aee937c43644bd85069bbb0c5b48a6293c90bb3
parentded49bbc1b9922f4f89343baec1829b5439d4d87
Merge branch '2.x-stable'