Merge branch 'master' into debian-precise
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 10 Oct 2013 09:55:33 +0000 (12:55 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 10 Oct 2013 09:55:33 +0000 (12:55 +0300)
commit69b4acee41be4a8d1695c0a9fa9a3cafdd12615a
tree316df9c8b92bdb252e6b81c8a91af1c0ae28c9fc
parentb9d5b28d5f9a00244b87907afacca8b34304801e
parent9afcc8c98844bcf8848b4f8505c12e1c3a6a1fb9
Merge branch 'master' into debian-precise