David Maloney 52a29856b3 Merge branch 'master' into staging/electro-release ...

Conflicts:
	Gemfile
	Gemfile.lock

2014-07-16 09:38:44 -05:00

..

aix

Update ibstat_path.rb

2014-05-22 14:16:04 -07:00

android

Minor spacing and word choice fixups

2014-06-16 11:40:21 -05:00

apple_ios

Resplat another common boilerplate.

2013-10-15 14:07:48 -05:00

bsdi/softcart

Redo the boilerplate / splat

2013-10-15 13:51:57 -05:00

dialup/multi/login

Redo the boilerplate / splat

2013-10-15 13:51:57 -05:00

firefox/local

Minor updates for release

2014-03-17 13:26:26 -05:00

freebsd

Fix first chunk of msftidy "bad char" errors

2014-03-11 11:18:54 -05:00

hpux/lpd

Redo the boilerplate / splat

2013-10-15 13:51:57 -05:00

irix/lpd

Progress

2014-01-22 11:20:10 -06:00

linux

Set up a proper peer method

2014-07-14 13:29:07 -05:00

multi

Merge branch 'master' into staging/electro-release

2014-07-16 09:38:44 -05:00

netware

Update modules to use new ZDI reference

2013-10-21 15:13:46 -05:00

osx

Grammar

2014-04-28 19:49:56 +01:00

solaris

Redo the boilerplate / splat

2013-10-15 13:51:57 -05:00

unix

Use vprint_ instead of print_

2014-07-15 06:58:33 +02:00

windows

Merge branch 'master' into staging/electro-release

2014-07-16 09:38:44 -05:00