Merge remote branch 'acp.style/master'
authorTim Düsterhus <timwolla@arcor.de>
Tue, 1 Jan 2013 22:49:20 +0000 (23:49 +0100)
committerTim Düsterhus <timwolla@arcor.de>
Tue, 1 Jan 2013 22:49:20 +0000 (23:49 +0100)
commit845907323978d1e5a5d499c4ca1224c8e6529af7
tree8ce794a86fc3f1f3d01f9ad7c6265b2cb05d758d
parent61d1f05a01c0bb5c54a366392c5213fcd5ad175e
parent478a2421808c351f027036c91d79155843a5f310
Merge remote branch 'acp.style/master'

Conflicts:
.travis.yml
.travis.yml