Merge branch 'devel' into debian-devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 12:07:02 +0000 (12:07 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Mon, 4 Mar 2013 12:07:02 +0000 (12:07 +0000)
commitb8b31c6f7ae525e04a937c7388189687e1a0cf29
tree9fd9eb1f1f4c5876b13f968154071fbcc67d0b0f
parent4b321c685dc2c0d7f9c6638da90fd4ce4dbb0746
parentace68d018caebce2ff185ce62611c7eadcff23ae
Merge branch 'devel' into debian-devel