Merge branch '2.x-stable'
authorThomas Kjeldahl Nilsson <support@gitorious.org>
Tue, 19 Mar 2013 10:16:20 +0000 (11:16 +0100)
committerThomas Kjeldahl Nilsson <support@gitorious.org>
Tue, 19 Mar 2013 10:16:20 +0000 (11:16 +0100)
commit37aa7fa63e8d11ef38cea1b7cb43997a5510627a
tree1fb53190491070879d67c547d15470ca1966b514
parent7e441e696c33884f6072b83013a9395444009aa2
parent09ed9c19f26ec7091a390c00cc1cb2d0389dfc40
Merge branch '2.x-stable'