Merge from master
authorfendo <fendo@bi12info.com>
Tue, 21 May 2013 09:54:43 +0000 (11:54 +0200)
committerfendo <fendo@bi12info.com>
Tue, 21 May 2013 09:54:43 +0000 (11:54 +0200)

No differences found