Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 15 Nov 2012 14:51:25 +0000 (15:51 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 15 Nov 2012 14:51:25 +0000 (15:51 +0100)
commitcf34f9fd4c28854152a995bdc9243b8a7bb893a1
tree9a689a1077b5d6a14614c8c59fc22cc0ee5596e4
parent75362c3c044a252f4d596ed8b28cad8069c2e781
parenta1ef75fbcaae97315c7ebc5c5efdc3a4df0ad32a
Merge branch 'master' into release