diff --git a/CHANGES b/CHANGES index ba9102aeeb..1b4d3841bd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.2-177 | 2014-02-20 17:27:46 -0800 + + * Update to libmagic version 5.17. Addresses BIT-1136. (Jon Siwek) + 2.2-174 | 2014-02-14 12:07:04 -0800 * Support for MPLS over VLAN. (Chris Kanich) diff --git a/VERSION b/VERSION index 5b847786b5..598049d62c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2-174 +2.2-177 diff --git a/src/3rdparty b/src/3rdparty index 42a4c9694a..e96d95a130 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 42a4c9694a2b2677b050fbb7cbae26bc5ec4605a +Subproject commit e96d95a130a572b611fe70b3c3ede2b4727aaa22