Merge branch 'feature/package-name-version' into blead
authorRafael Garcia-Suarez <rgs@consttype.org>
Thu, 8 Oct 2009 13:13:18 +0000 (15:13 +0200)
committerRafael Garcia-Suarez <rgs@consttype.org>
Thu, 8 Oct 2009 13:13:18 +0000 (15:13 +0200)
1  2 
op.c

diff --cc op.c
Simple merge