Release 2.1.4: merge remote-tracking branch 'origin/master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 13 Dec 2013 18:58:56 +0000 (19:58 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 13 Dec 2013 18:59:07 +0000 (19:59 +0100)
commit25dd1b2e713206ab5c365c041aebeb8bf8869ca4
treed9fb4d4aaa2b65ecc80785437c0e1d610723c429
parent54be21e43ea5b0268858e09f0252bb3909ef6132
parent7cb1f563b6f5568953064b8e9bd7e63f0ad874ab
Release 2.1.4: merge remote-tracking branch 'origin/master' into release