Merge branch 'master' of gitorious.org:~thomanil/gitorious/thomas-mainline
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Wed, 4 Apr 2012 07:39:41 +0000 (09:39 +0200)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Wed, 4 Apr 2012 07:39:41 +0000 (09:39 +0200)
commit224b6c588235f7d62562261f36375bd0f1581d09
tree4e149be6ea20e41e7e4746c6f4d00cd2d30973c2
parentbd2f64e0dca35a6d1609a4693c892571e4604db3
parentbf95f598f207641b850ff5e6728b251ab1ef74a7
Merge branch 'master' of gitorious.org:~thomanil/gitorious/thomas-mainline