Merge from master 2.2.1-2sames3.12
authorfendo <fendo@bi12info.com>
Mon, 7 Oct 2013 20:49:53 +0000 (22:49 +0200)
committerfendo <fendo@bi12info.com>
Mon, 7 Oct 2013 20:49:53 +0000 (22:49 +0200)

No differences found