Merge branch '2.x-stable'
authorChristian Johansen <christian@gitorious.com>
Tue, 29 Jan 2013 08:20:02 +0000 (09:20 +0100)
committerChristian Johansen <christian@gitorious.com>
Tue, 29 Jan 2013 08:20:02 +0000 (09:20 +0100)
commit26ec94e51b1fa23d8381bf51d16d7ae21d0d32dc
tree0463b22091dd90d0ed85bb8607c8b848b7b1a2d6
parent523dbe5f0e7924f1ae17bf61d3e5546559b05ad8
parent82ba04bbe1c436ffa3bd89462258505d608262aa
Merge branch '2.x-stable'