Fix erroneous merge.
authorZdeněk Šustr <sustr4@cesnet.cz>
Fri, 15 Jun 2012 13:01:57 +0000 (13:01 +0000)
committerZdeněk Šustr <sustr4@cesnet.cz>
Fri, 15 Jun 2012 13:01:57 +0000 (13:01 +0000)
commit64acc2fb3793afaccc01efb32f8466ecb6756fdb
tree0e792e28c0b14e0fb1f973caaace4d7890f1bf4f
parentb6ce62bf74e1b8b861f180a2ac83fd418c82c7f7
Fix erroneous merge.
org.glite.lb.server/src/dump.c