# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1316432971 -3600
# Node ID 614b2d1580d0504d3cd9d10e00320a8381436d1a
# Parent  f098cfb337217f92bcbf16cea794cb1ab14052f5# Parent  a0e028d6060a1c42dc762261f53d74b1db1a2d76
Merge from branch "luisf"

diff -r f098cfb33721 -r 614b2d1580d0 vendor/plugins/redmine_bibliography/app/models/bibtex_entry_type.rb
--- a/vendor/plugins/redmine_bibliography/app/models/bibtex_entry_type.rb	Fri Sep 16 18:36:18 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/models/bibtex_entry_type.rb	Mon Sep 19 12:49:31 2011 +0100
@@ -1,6 +1,6 @@
 class BibtexEntryType < ActiveRecord::Base
 
-  @@all_fields = [ "editor", "publisher", "chapter", "pages", "volume", "series", "address", "edition", "month", "year", "type", "note", "number", "journal", "howpublished", "key", "school" ]
+  @@all_fields = [ "booktitle", "editor", "publisher", "chapter", "pages", "volume", "series", "address", "edition", "month", "year", "type", "note", "number", "journal", "howpublished", "key", "school" ]
 
   @@fields = Hash['article', ['journal', 'year', 'volume', 'number', 'pages', 'month', 'note' ], 
                   'book' , [ 'editor', 'publisher', 'volume', 'series', 'address', 'edition', 'month', 'year', 'note' ],