Merge branch 'master' into debian
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 13 Feb 2013 16:26:22 +0000 (18:26 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 13 Feb 2013 16:26:22 +0000 (18:26 +0200)
commit11b0fe6687e41240de5bbb78b362eb0cd484d93c
treee095d4bd9c6697890924fd373010ed66581a6365
parent3b7ccba1f77b70415648e9bb1a3126254ec4a9ee
parent701933be914636352cdf05b6970d9ef047a0a58d
Merge branch 'master' into debian

Conflicts:
version