Updated coldfusion_local_traversal as described in Redmine Feature #6822
fixed an error that occurred when patching.
Noted support for importing XML reports.
replace unless rhosts.include? with rhosts.uniq!

seems like this will speed up the process due to far less Array lookups
Fix NoMethodError if handler has no ParentModule

db.rb assumes that multi/handler sessions have a ParentModule defined
in their datastore. This assumption breaks when a user sets up a
multi/handler by hand to receive a session from another user (e.g.,
via multi_meter_inject).

When db.rb tries to access a member of a nil ParentModule, a
stacktrace is dumped to framework.log.
Add ZoneMinder arbitrary command execution exploit
Merge branch 'zoneminder_packagecontrol_exec' of github.com:bcoles/metasploit-framework into bcoles-zoneminder_packagecontrol_exec
Picasa 2 credentials are now also saved as loot

This module used to save only Picasa 3 credentials as loot. Picasa
2 creds were displayed, but not saved. I've updated the module to
save Picasa 2 credentials, and I also updated the output code to
use print_good instead of print_status.
Armitage 01.23.13

This update to Armitage adds the ability to assign labels to hosts
and create dynamic workspaces based on these labs. This update also
adds helpers to configure USERNAME/PASSWORD options and EXE::Custom
and EXE::Template. Several bugs were fixed as well.
Merge branch 'rsmudge-armitage'
Merge branch 'picasa' of github.com:charles-n2netsec/metasploit-framework into charles-n2netsec-picasa
Msftidy cleanup + handling return values better
Merge branch 'fixmh' of github.com:rsmudge/metasploit-framework into rsmudge-fixmh
Merge branch 'master' of github.com:averagesecurityguy/metasploit-framework into averagesecurityguy-master
Merge branch 'averagesecurityguy-master'
Merge branch 'feature/rm6822-coldfusion_locale_traversal' of github.com:lmercer-r7/metasploit-framework into lmercer-r7-feature/rm6822-coldfusion_locale_traversal
Apply the changes I suggested before
Merge branch 'slight_speedup_to_db_hosts-R' of github.com:kernelsmith/metasploit-framework into kernelsmith-slight_speedup_to_db_hosts-R