Merge remote-tracking branch 'stabledog/master'
authorDaniel Carl <danielcarl@gmx.de>
Sat, 4 Jan 2014 18:55:15 +0000 (19:55 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Sat, 4 Jan 2014 18:55:15 +0000 (19:55 +0100)
commit29fe7d860a012a9894a06baa0214f239ca6a5deb
treed4a33081159008f0711adca19bb6c73096c8108b
parent54456124f4997cdca50bf4bb6927185787c0a6cb
parent60d1b518b1118eeae9025653aec1d90e5073577d
Merge remote-tracking branch 'stabledog/master'