Merge branch '2.x-stable'
authorMarius Mathiesen <marius@gitorious.org>
Tue, 8 Jan 2013 11:38:30 +0000 (12:38 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Tue, 8 Jan 2013 11:38:30 +0000 (12:38 +0100)
commit7aee937c43644bd85069bbb0c5b48a6293c90bb3
treef1ae460802da81b3063595feaeef7bac0edfb1f6
parent591633040362730312691574f428afa9547edab1
parent13cf7ddc0eadf7505918a222bb1e519cae35d45e
Merge branch '2.x-stable'