From 8536ea2859879689cdca58cd0c9bfac3be84c6f5 Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabiolocati@gmail.com>
Date: Oct 13 2014 17:05:54 +0000
Subject: Fix merge conflicts


---

diff --git a/.gitignore b/.gitignore
index d180706..0315bdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 asio-1.4.1.tar.gz
 /asio-1.4.8.tar.bz2
 /asio-00cdf672654fda984b0c57218eaf77845ad4167a.tar.gz
+/asio-581fe686293be42260800c54cf2ac33576f35497.tar.gz
diff --git a/sources b/sources
index 6f8a360..a8dafa0 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 c158ab8c9794426c771b4096d1eebb4d  asio-00cdf672654fda984b0c57218eaf77845ad4167a.tar.gz
+f5a930cb07430f9c1b07c0cf83bb9296  asio-581fe686293be42260800c54cf2ac33576f35497.tar.gz