Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 17 Nov 2012 02:33:33 +0000 (03:33 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 17 Nov 2012 02:33:33 +0000 (03:33 +0100)
commit178d498b825f815a2b9f1aaab1d6f5d41b3cd414
treed0dbc9de08c144834f01e398503a13058e080315
parent92aa0fb3b569b4678bc08d6061d3115517d54252
parent497c99967ba2ebf4662e1028c9c65165298961a6
Merge branch 'master' into release