From 01558d3d5166b2c9031fb1be1fe06d329058416f Mon Sep 17 00:00:00 2001
From: Metasploit <metasploit@rapid7.com>
Date: Tue, 21 Feb 2017 14:01:15 -0800
Subject: [PATCH] Bump version of framework to 4.13.26

---
 Gemfile.lock                        | 37 ++++++++++++++---------------
 lib/metasploit/framework/version.rb |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 49f2e7d0fb..dd54d76c16 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.13.25)
+    metasploit-framework (4.13.26)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -63,29 +63,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
       arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
@@ -149,7 +148,7 @@ GEM
     i18n (0.8.0)
     jsobfu (0.4.2)
       rkelly-remix
-    json (1.8.6)
+    json (2.0.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     metasm (1.0.2)
@@ -192,7 +191,7 @@ GEM
     multi_test (0.1.2)
     multipart-post (2.0.0)
     nessus_rest (0.1.6)
-    net-ssh (4.0.1)
+    net-ssh (4.1.0)
     network_interface (0.0.1)
     nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
@@ -226,9 +225,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
diff --git a/lib/metasploit/framework/version.rb b/lib/metasploit/framework/version.rb
index 0721014c2a..84ac6aa7f1 100644
--- a/lib/metasploit/framework/version.rb
+++ b/lib/metasploit/framework/version.rb
@@ -30,7 +30,7 @@ module Metasploit
         end
       end
 
-      VERSION = "4.13.25"
+      VERSION = "4.13.26"
       MAJOR, MINOR, PATCH = VERSION.split('.').map { |x| x.to_i }
       PRERELEASE = 'dev'
       HASH = get_hash