]> saetta.ns0.it Git - zakaudit/libzakaudit/commit
Merge conflit.
authorAndrea Zagli <azagli@libero.it>
Tue, 24 Dec 2013 20:50:12 +0000 (21:50 +0100)
committerAndrea Zagli <azagli@libero.it>
Tue, 24 Dec 2013 20:50:12 +0000 (21:50 +0100)
commit5bfcd9942d18c97e041a0bbad8d61e372595ab5e
tree9b5755a2ed3d642f0bfc984dca89803d743ed38f
parent467a9c1bd566a7b421f7b44d87e04f18e8457eb9
parent476d04d106dcb058e8af50136434884e8710090e
Merge conflit.
configure.ac