Resolve merge conflict
authorChristian Johansen <christian@gitorious.org>
Wed, 24 Aug 2011 15:08:56 +0000 (17:08 +0200)
committerChristian Johansen <christian@gitorious.org>
Wed, 24 Aug 2011 15:08:56 +0000 (17:08 +0200)
commitae691969a2af7eb66bbcd1403c00931f798b43c4
tree407335a71c1a8cc6ae62ebb01b356bf85d68c1dc
parent2bbca40eb0aab1776c76c7e9ef150d645e571913
parent49cff8290e7290126f9afabf0756846b04d64b8b
Resolve merge conflict