# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.# On branch master# Changes to be committed:#   (use "git reset HEAD <file>..." to unstage)#	deleted:    #all_data_view.py#	deleted:    #detail_view.py#	modified:   #home_view.py#	deleted:    #models.py#	deleted:    #search_view.py#	deleted:    #settings.py#	deleted:    #tables.py#	deleted:    #urls.py#	modified:   admin.py	modified:   admin.pyc	modified:   all_data_view.pyc	modified:   detail_view.py	modified:   detail_view.pyc	deleted:    models (ubuntu's conflicted copy 2013-09-05).pyc	modified:   models.py	modified:   models.pyc	deleted:    rnamodels.pyc	modified:   tables.py	modified:   tables.pyc	modified:   urls.py	modified:   urls.pyc## Untracked files:#   (use "git add <file>..." to include in what will be committed)##	migrations/0069_auto__add_field_read_alignment_normalizedReads.pyc#	migrations/0070_auto__del_field_read_alignment_normalizedReads__add_unique_read_alignm.py#	migrations/0070_auto__del_field_read_alignment_normalizedReads__add_unique_read_alignm.pyc#	migrations/0071_auto__del_unique_read_alignment_start_chr_stop.py#	migrations/0071_auto__del_unique_read_alignment_start_chr_stop.pyc#	migrations/0072_auto__add_unique_read_alignment_start_chr_stop.py#	migrations/0072_auto__add_unique_read_alignment_start_chr_stop.pyc#	migrations/0073_auto__add_unique_interval_start_chr_stop__del_unique_read_alignment_st.py#	migrations/0073_auto__add_unique_interval_start_chr_stop__del_unique_read_alignment_st.pyc#	migrations/0074_auto__del_unique_interval_start_chr_stop.py#	migrations/0074_auto__del_unique_interval_start_chr_stop.pyc#	migrations/0075_auto__add_unique_interval_start_chr_stop.py#	migrations/0075_auto__add_unique_interval_start_chr_stop.pyc#	migrations/0076_auto__add_field_read_alignment_normCount.py#	migrations/0076_auto__add_field_read_alignment_normCount.pyc#	migrations/0077_auto__del_field_read_alignment_normCount__add_field_read_alignment_nor.py#	migrations/0077_auto__del_field_read_alignment_normCount__add_field_read_alignment_nor.pyc#	migrations/0078_auto__del_field_read_alignment_normRead.py#	migrations/0078_auto__del_field_read_alignment_normRead.pyc#	migrations/0079_auto__add_field_read_alignment_normRead.py#	migrations/0079_auto__add_field_read_alignment_normRead.pyc#	migrations/0080_auto__del_field_read_alignment_normRead.py#	migrations/0080_auto__del_field_read_alignment_normRead.pyc#	migrations/0081_auto__add_field_read_alignment_normReads.py#	migrations/0081_auto__add_field_read_alignment_normReads.pyc#	migrations/0082_auto__add_field_read_alignment_IntName.py#	migrations/0082_auto__add_field_read_alignment_IntName.pyc#	migrations/0083_auto__del_field_read_alignment_IntName.py#	migrations/0083_auto__del_field_read_alignment_IntName.pyc#	migrations/0084_auto__chg_field_read_alignment_normReads.py#	migrations/0084_auto__chg_field_read_alignment_normReads.pyc#	migrations/0085_auto__add_field_read_alignment_intervalName__chg_field_read_alignment_.py#	migrations/0085_auto__add_field_read_alignment_intervalName__chg_field_read_alignment_.pyc#	migrations/0086_auto__chg_field_read_alignment_intervalName__add_index_read_alignment_.py#	migrations/0086_auto__chg_field_read_alignment_intervalName__add_index_read_alignment_.pyc#	migrations/0087_auto__chg_field_read_alignment_intervalName__del_index_read_alignment_.py#	migrations/0087_auto__chg_field_read_alignment_intervalName__del_index_read_alignment_.pyc#	migrations/0088_auto__del_field_read_alignment_intervalName.py#	migrations/0088_auto__del_field_read_alignment_intervalName.pyc#	migrations/0089_auto__add_field_read_alignment_intervalName.py#	migrations/0089_auto__add_field_read_alignment_intervalName.pyc#	parser.py
26 nov 2013
	modified:   admin.py
	modified:   admin.pyc
	modified:   all_data_view.pyc
	modified:   detail_view.py
	modified:   detail_view.pyc
	modified:   forms.py
	modified:   forms.pyc
	modified:   graph.pyc
	modified:   home_view.pyc
	new file:   interval_detail_view.py
	new file:   interval_detail_view.pyc
	modified:   models.py
	modified:   models.pyc
	new file:   parser.py
	new file:   rnamodels.pyc
	modified:   search_view.pyc
	modified:   settings.py
	modified:   settings.pyc
	modified:   tables.py
	modified:   tables.pyc
	new file:   test.py
	new file:   tests.py
	new file:   tests.pyc
	modified:   urls.py
	modified:   urls.pyc
	modified:   views.pyc
Merge branch 'master' of https://github.com/alvinwt/DjangoSRBdB