Merge branch 'refactor/org-macros'
authorDavid Maus <dmaus@ictsoc.de>
Fri, 12 Aug 2011 06:49:24 +0000 (08:49 +0200)
committerDavid Maus <dmaus@ictsoc.de>
Fri, 12 Aug 2011 06:49:24 +0000 (08:49 +0200)
commit7410001a4768b58a9e6c9ea414a0aeffec1a8471
treeae514d9004e4335b453678eb9a0af18ee8c486dd
parent44e42d4dabf839f94ef682fa43cf7d66ac1e7109
parent545bfddeead9496a6ecc8ade24f6e30b71995e08
Merge branch 'refactor/org-macros'