Merge branch 'master' of git.triptico.com:git/artemus
commita4091c6b216817504d233101018f51df92ea4b06
authorAngel Ortega <angel@triptico.com>
Thu, 6 Oct 2011 09:05:34 +0000 (6 11:05 +0200)
committerAngel Ortega <angel@triptico.com>
Thu, 6 Oct 2011 09:05:34 +0000 (6 11:05 +0200)
treeadbab2f47757e75be68c8b1d546bc77539aac8f4
parent8b2b9a4625f7e60098fb3647b38826c98efbd3cb
parentdbc7d2c78339e78b0b0b9b6234d73b83b3b6522c
Merge branch 'master' of git.triptico.com:git/artemus