Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 6 Sep 2014 14:59:14 +0000 (16:59 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 6 Sep 2014 14:59:14 +0000 (16:59 +0200)
commitfff767089e462f98af477de8aa0d51da1e549f81
tree12f5096ab1dd94f60bb8b08175871317752b8918
parentfc7c03b1812da2ce56900c607ec06ffb48c99ac3
parent986e149eabffa8c045d0bb2c673155eba7a82241
Merge remote-tracking branch 'upstream/master'