Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Tue, 27 Aug 2013 08:47:47 +0000 (10:47 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Tue, 27 Aug 2013 08:47:47 +0000 (10:47 +0200)
commitc5b921b5975f84ec31077cf5333f14736efe40b6
treeff9e73e29d547543aff3e7b57ae7f7f10212c806
parent7a20e2e1f8ff0893e239aa2d855d8a00a510d769
parente86ea47c029c1f95a696e43df7bea2e3e617fbc3
Merge remote-tracking branch 'upstream/master'