From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 9 Aug 2013 13:21:21 +0000 (+0300)
Subject: Merge tag 'upstream/2.5'
X-Git-Tag: debian/2.5-1~3
X-Git-Url: http://git.ieval.ro/?p=xfishtank.git;a=commitdiff_plain;h=df1fec884c7542f8891e69b8b674186572decb42

Merge tag 'upstream/2.5'

Upstream version 2.5
---

df1fec884c7542f8891e69b8b674186572decb42