From 7e5fd8a35b947f1ff31f2f7b9926fc23072e1efd Mon Sep 17 00:00:00 2001
From: Jason Zaman <jason@perfinion.com>
Date: Mon, 3 Aug 2015 03:22:58 +0800
Subject: Merge upstream

---
 gentoo/STATE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index 27a441fa..c0119130 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 2292e4bf40e6a12124963dcb866d9a2e43af073f
-master is at 11697e1a69b7707f4528f80dce5572b0f446dc57
+contrib is at 32c25f2d965569e18489913fbda5e0f0c6f90d51
+master is at c8c2b8b0c80a59414aefc4d32fdd2e8152ea5af2
-- 
cgit v1.2.3-65-gdbad