fix for Ruby1.9: Encoding-Issue
added some methods to the class Encoding
Merge branch 'MagLev-1.1' of github.com:MagLev/maglev into EncodingFixRuby1.9

Conflicts:
	lib/ruby/1.8/maglev/openssl/ffi/libcrypto.rb
fixed bug by rdoc installation and defined(without implementation) some methods for the Encoding class
github157: fixed endless loop in Array.inject.
Added maglev_key to .gitignore.
Merge branch 'hpi' into EncodingFixRuby1.9
some 1.9 transition work, renaming the library paths and declaring 1.9 support in all the ways I could find
Merge remote-tracking branch 'origin/EncodingFixRuby1.9' into master-1.9
update Globals.rb for 1.9
found where we put the version.txt
Merge pull request #182 from MagLev/stefan/visibility-fix-for-master

Visibility fix for master1.9
enable travis
don't run rubyspecs until we figure out why some fail even though they are tagged
Merge remote-tracking branch 'origin/master-1.9' into master-1.9
update version.txt
Merge remote-tracking branch 'origin/master-1.9' into master-1.9
Merge remote-tracking branch 'origin/master' into master-1.9

Conflicts:
	src/kernel/bootstrap/Globals.rb
	version.txt
Merge branch 'master' into master-1.9
Merge remote-tracking branch 'origin/master' into master-1.9