Merge remote-tracking branch 'jaimeMF/SearchIE'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 13 May 2013 17:43:35 +0000 (19:43 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 13 May 2013 17:43:35 +0000 (19:43 +0200)

Trivial merge