From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 14 Dec 2012 20:50:10 +0000 (+0100)
Subject: Merge branch 'remove-atom-include'
X-Git-Tag: 4.5~109^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6dc25e0011abaad563f45098e18e3898d0e70953;p=i3%2Fi3

Merge branch 'remove-atom-include'
---

6dc25e0011abaad563f45098e18e3898d0e70953