Solve merge conflicts in .install and .info file between generic-reposync and 6.x-2.x

Before we can merge generic-reposync into 6.x-2.x we must get rid of these trivial merge conflicts:

• Both branches add files[] to the .info file. Choose both.
• Both branches define a new schema table. Choose both.
• Both branches add implementations of hook_update_N(). Choose both, fixing numbering.

I merged 6.x-2.x into generic-reposync here: https://github.com/niklasf/versioncontrol_git/commit/bb8109587eb1ed2dcaf97. Please review and cherry-pick this on top of generic-reposync.