Merge branch 'master' into debian

2 files changed, 8 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 9bc02bc..f2ebef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mat (0.3) unstable; urgency=medium
+
+  * Use system wide config file for label_name & label_id_prefix.
+
+ -- cos <cos>  Wed, 17 Dec 2014 15:18:23 +0100
+
 mat (0.2) unstable; urgency=medium
 
   * Include new dependencies introduced in last merge.
diff --git a/mat b/mat
index 382f003..16478fe 100755
--- a/mat
+++ b/mat
@@ -14,8 +14,8 @@ use Text::Iconv;
 
 tie my %Config, "Config::Simple", '/etc/mat.conf';
 
-use constant LABEL_NAME => `sed --silent 's/^label_name //p' < config|tr -d '\\n'`;
-use constant LABEL_ID_PREFIX => `sed --silent 's/^label_id_prefix //p' < config|tr -d '\\n'`;
+use constant LABEL_NAME => $Config{'label_name'};
+use constant LABEL_ID_PREFIX => $Config{'label_id_prefix'};
 
 #use Data::Dumper;