Merge branch '2.x-stable'
authorMarius Mathiesen <marius@gitorious.org>
Mon, 4 Mar 2013 08:46:02 +0000 (09:46 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Mon, 4 Mar 2013 08:46:02 +0000 (09:46 +0100)
commitaa805129659dd2737c36b39086af7fe867fe6140
treed46a7dd713819dd14159d9051e6c7c9b682bcde9
parenteed87073328fe32a63948e01af0dd7a831686a93
parent175029154dcbd3e4dba16b9fe57a956144085944
Merge branch '2.x-stable'