]> Some of my projects - localmylist.git/commit
Merge branch 'master' of ssh://aptx.org/var/git/localmylist
authorAPTX <marek321@gmail.com>
Sat, 9 Jun 2012 17:11:45 +0000 (19:11 +0200)
committerAPTX <marek321@gmail.com>
Sat, 9 Jun 2012 17:11:45 +0000 (19:11 +0200)
commite7f90c84653ae35dd3f8624ec3212407116fa1b2
treea0b063c2ab3792140b8b0fb62b0fa5137d4770bb
parent1da03f03a0d6b3c132ff8b92c94732a7b19551fc
parent852969bce80c5981eac4b5d8ed21040b814f5220
Merge branch 'master' of ssh://aptx.org/var/git/localmylist

Conflicts:
anioni/anioni.cpp
anioni/anioni.cpp