From ad684a6f6b745f5fffd303e0d0f4856371c8e4af Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 28 Sep 2014 16:30:37 -0700
Subject: [PATCH] Merge version update

---
 AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7383b6ee..3b5530ef 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.limelight"
-    android:versionCode="34"
-    android:versionName="2.5.5" >
+    android:versionCode="35"
+    android:versionName="2.5.5.1" >
 
     <uses-sdk
         android:minSdkVersion="16"