Merge pull request #2352 from MediaBrowser/master

merge from master

MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -1244,4 +1244,4 @@ namespace MediaBrowser.Model.Dlna
             return true;
         }
     }
-}
+}

MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs

@@ -133,4 +133,4 @@ namespace MediaBrowser.XbmcMetadata.Savers
         {
         }
     }
-}
+}

SharedVersion.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.1.*")]
-//[assembly: AssemblyVersion("3.0.6060")]
+//[assembly: AssemblyVersion("3.1.*")]
+[assembly: AssemblyVersion("3.1.259")]