Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jan 2012 12:07:55 +0000 (13:07 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jan 2012 12:07:55 +0000 (13:07 +0100)
commit2979b18ffbfd59ef8f35db2a52e467370bca1a06
treee8941ebb54ad0327dce77b0b537e44c484f613cd
parentad583a9a7039d857e5988f37b6263c25eec86c24
parent1858a00e7403220e361917eb6844467c9a0087bd
Merge branch 'master' into release