Gemfile merge
11g-Attribute abtesten für Partition-Anzeige
ID statt Index für Cookie lastLogins
Creation+Last DDL in Table-Description
Dataguard-Info in Anmeldung
Version ++
Spalte Projection im Execution Plan
Access Full Name für Explain Plan SGA
js kleine Bugs + Trace-Schalter
Anaylze-Info mit MBytes
Merge-Conflicts lösen
Merge Rails 3 -> 1
Merge commit '4a62ed970961c3a8c2f6c93e7563e65d4af6acda'

Conflicts:
	app/controllers/dba_schema_controller.rb
Merge commit '5cd82e6118216f0652b74838e1c073bfeef18291'

Conflicts:
	app/controllers/env_controller.rb
Fehler vom Merge
Merge commit '7a092757b819e7c025c47a2544af8dad3d47668d'
Merge commit '1c635b34915a42fc4bd9e9aea76c3dedcfdca0b3'

Conflicts:
	app/helpers/dragnet_helper.rb
Merge commit '4845d68126c2f34ffbe689718557a8f7cfa5712b'

Conflicts:
	app/views/dba_history/_list_sql_detail_execution_plan.html.erb
	app/views/dba_sga/_list_sql_detail_execution_plan.html.erb
Merge commit '9bcbedb893887ad6acadfe611fc4b3bccf5ac5e8'

Conflicts:
	Gemfile.lock
	Panorama.war
	app/helpers/dragnet_helper.rb
	config/warble.rb
	doc/Installation_JRuby.txt