Merge branch 'master' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Tue, 13 Aug 2013 11:58:04 +0000 (13:58 +0200)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Tue, 13 Aug 2013 11:58:04 +0000 (13:58 +0200)
commit735f3f56903a89656face81b7eaf8682aac064d0
tree82d8f2a50e1b95492df9339431fc905d44b4019f
parent477ae6291a796b48edfbe7d4fd16744f9d05ff30
parentb96cf046e028387ca7142b8ef000f2dc57f01d39
Merge branch 'master' into debian-devel