commit: 7df7f0038523f3611de1969dd553c8fd0a7861de parent 17093b83ca0ee3a569b6d3ced099c6055828812c Author: Philipp Hagemeister <phihag@phihag.de> Date: Sun, 12 Jan 2014 12:55:05 +0100 Merge remote-tracking branch 'origin/master'
commit: 7df7f0038523f3611de1969dd553c8fd0a7861de parent 17093b83ca0ee3a569b6d3ced099c6055828812c Author: Philipp Hagemeister <phihag@phihag.de> Date: Sun, 12 Jan 2014 12:55:05 +0100 Merge remote-tracking branch 'origin/master'