From 73cbb84f09b18e9611b34e0544c53dbf07ac1930 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eric@boostpro.com>
Date: Mon, 30 Apr 2012 01:44:50 +0000
Subject: merge [78122], [78141], [78196] from trunk

[SVN r78260]
---
 libs/proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libs/proto')

diff --git a/libs/proto b/libs/proto
index 7fd2cafefe..9c88aea0e6 160000
--- a/libs/proto
+++ b/libs/proto
@@ -1 +1 @@
-Subproject commit 7fd2cafefed9e28eb4fa623ce488550fffaec676
+Subproject commit 9c88aea0e6d3b3ad444c9158af0b10f63a62e390
-- 
cgit v1.2.1