Matt Buck 2cd5be021b Merge branch 'master' into staging/rails-4.0 ... Conflicts: Gemfile Gemfile.lock db/schema.rb metasploit-framework-db.gemspec metasploit-framework.gemspec		2015-01-08 13:12:27 -06:00
..
base	use kind_of? for checking exceptions	2014-12-30 21:16:57 +01:00
core	Merge branch 'master' into staging/rails-4.0	2015-01-08 13:12:27 -06:00
http	update wordpress readme regex	2015-01-01 23:13:20 +01:00
kerberos	Use random subkey	2014-12-22 15:39:08 -06:00
scripts	Refactor WindowsServices	2012-11-06 17:30:04 -06:00
ui	Land #4494, Object.class.to_s fix	2015-01-06 02:27:35 -06:00
util	Land #4377, Support DYNAMIC_BASE templates - resolves #4366	2014-12-23 11:57:33 +00:00
LICENSE	…
base.rb	Fix Undocumentable method, missing name YARD warning	2013-03-30 15:32:38 -05:00
core.rb	Delete Microsoft namespace from the mixin	2014-12-19 18:41:27 -06:00
events.rb	Retab lib	2013-08-30 16:28:33 -05:00
sanity.rb	Revert "Various merge resolutions from master <- staging"	2014-08-22 10:17:44 -05:00
ui.rb	Mark all libraries as defaulting to 8-bit strings	2012-06-29 00:18:28 -05:00
util.rb	Mark all libraries as defaulting to 8-bit strings	2012-06-29 00:18:28 -05:00
windows_error.rb	Retab lib	2013-08-30 16:28:33 -05:00