Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Tue, 3 Jan 2012 23:59:54 +0000 (00:59 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Tue, 3 Jan 2012 23:59:54 +0000 (00:59 +0100)
commit2b2767288398d6cdcbe1201a8b52ef515a5f6591
treeffbeba2cf61cd7f6a67de4419f386863953205dd
parentfe0cd8aa72091d860ad374abcbc0d8217f25ba69
parentf962137ebc9e6ff56ecf2386b17980a6c04302a7
Merge branch 'master' into release