Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Wed, 28 Aug 2013 10:20:12 +0000 (12:20 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Wed, 28 Aug 2013 10:20:12 +0000 (12:20 +0200)
commitcd9c100963e8b8bf651d1f359e5f7812603ca0fd
tree34f7dbbec72b386cc9f35fe9b1a1c9edab8eea6d
parentb7f89fe692109368e35b4a0723e1044ed6b51e1e
parentedde6c56ac20af57d7fd494810834125bbd3728d
Merge remote-tracking branch 'upstream/master'