Merge branch 'master' of github.com:oniony/TMSU

Conflicts:
	README.md

README.md

@@ -139,7 +139,7 @@ v0.5.0
     shared or archived whilst preserving the tagging information. Existing
     absolute paths can be converted by running a manual repair:
 
-        tmsu repair --mnaual / /
+        tmsu repair --manual / /
 
   * Added 'config' subcommand to view and amend settings.
   * The 'help' subcommand now wraps textual output to fit the terminal.

src/tmsu/cli/option.go

@@ -105,10 +105,10 @@ func (parser *OptionParser) Parse(args ...string) (commandName string, options O
 					if len(parts) == 2 {
 						option.Argument = parts[1]
 					} else {
-					    if len(args) < index+2 {
-					        err = fmt.Errorf("missing argument for option '%v'", optionName)
-					        return
-                        }
+						if len(args) < index+2 {
+							err = fmt.Errorf("missing argument for option '%v'", optionName)
+							return
+						}
 
 						option.Argument = args[index+1]
 						index++

src/tmsu/storage/database/database.go

@@ -42,8 +42,8 @@ func OpenAt(path string) (*Database, error) {
 		if os.IsNotExist(err) {
 			log.Warnf("creating database at '%v'.", path)
 
-            dir := filepath.Dir(path)
-            os.Mkdir(dir, 0755)
+			dir := filepath.Dir(path)
+			os.Mkdir(dir, 0755)
 		} else {
 			log.Warnf("could not stat database: %v", err)
 		}