From 0e575059551ae505822d767988e1122c5eda3350 Mon Sep 17 00:00:00 2001
From: Jindrich Luza <jluza@redhat.com>
Date: Aug 14 2013 10:00:21 +0000
Subject: Merge branch 'master' into f18


Conflicts:
	.gitignore
	libcomps.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 251e92e..4495658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 /libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz
+<<<<<<< HEAD
+=======
+/libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz
+>>>>>>> master
diff --git a/libcomps.spec b/libcomps.spec
index b687660..fb82d91 100644
--- a/libcomps.spec
+++ b/libcomps.spec
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 %global commit 257459634117baa067c3dde2a8ea83def6851094
+=======
+%global commit 4951a3ec8b8e9a210471c4d42be370a310cc78ab
+>>>>>>> master
 
 Name:           libcomps
 Version:        0.1.2
@@ -116,8 +120,13 @@ rm -rf $buildroot
 
 
 %changelog
+<<<<<<< HEAD
 * Thu Aug 08 2013 Jindrich Luza <jluza@redhat.com> 0.1.2.git2574596
 - spec modified
+=======
+* Wed Aug 14 2013 Jindrich Luza <jluza@redhat.com> 0.1.2.git4951a3e
+- __test.py print removed
+>>>>>>> master
 
 * Thu Jul 18 2013 Jindrich Luza <jluza@redhat.com> 0.1.2
 - automatic changelog system
diff --git a/sources b/sources
index 8a0b59f..2e23bc5 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 8c37e88f0b7880eaca5225454cc7a1e5  libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz
+=======
+8952cd6f4670123eb8b12d169f347157  libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz
+>>>>>>> master