Merge branch 'master' into master

Author: johanmattssonm

libbirdfont/SearchPaths.vala

@@ -50,6 +50,7 @@ public class SearchPaths {
 				if (f.query_exists ()) return f;	
 
 				f = get_file (folder + "/../", name);
+
 				if (f.query_exists ()) return f;
 
 				f = get_file (folder + "/../share/birdfont/", name);