Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Mon, 2 Sep 2013 23:27:49 +0000 (01:27 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Mon, 2 Sep 2013 23:27:49 +0000 (01:27 +0200)
commitb0446d6a33ed3b5789e57c83904f1d7cf1a85d19
tree70a69d7e9bad6a9f2d131b908d0a13b416fed704
parent847f582290c6ad6ec0c72760ea3cfa6417d28e3c
parent8e4e89f1c236e1bec38c5363c1c341930056211e
Merge remote-tracking branch 'upstream/master'