Merge branch '2.x-stable'
authorThomas Kjeldahl Nilsson <support@gitorious.org>
Tue, 19 Mar 2013 09:14:51 +0000 (10:14 +0100)
committerThomas Kjeldahl Nilsson <support@gitorious.org>
Tue, 19 Mar 2013 09:14:51 +0000 (10:14 +0100)
commit7e441e696c33884f6072b83013a9395444009aa2
treea56ff29e1626df180572a3e41da7eda39c64721b
parenta39f9b35c43315aa8765ff5097b37429e89a52fc
parent12df60d07a64851ed1626e7429b52cbb5674e910
Merge branch '2.x-stable'