From: Thomas Markwalder Date: Thu, 11 Jun 2015 10:19:21 +0000 (-0400) Subject: [master] Re-merge changes for 3802 X-Git-Tag: trac3732a_base~8^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=026b9d2c28304e69e4e18886c742213db2a0f42f;p=thirdparty%2Fkea.git [master] Re-merge changes for 3802 Additonal commits were made to master, while I was merging in 3802. --- 026b9d2c28304e69e4e18886c742213db2a0f42f