]> jfr.im git - irc/rizon/acid.git/commit
Merge branch 'master' into HEAD
authorAdam <redacted>
Mon, 27 Apr 2015 22:17:45 +0000 (18:17 -0400)
committerAdam <redacted>
Mon, 27 Apr 2015 22:17:45 +0000 (18:17 -0400)
commitc80b16c6c8de1682f80b74a9c949c99089f62bd6
tree8c5d1f34fb9734fdb0e8514b7ed02cc06d9aedb0
parent1a37f85b4980223b12ffcc81d7119ebec9b924ff
parenta69a4457cf90c4570c15c72f3c791e8787cdb518
Merge branch 'master' into HEAD

Conflicts:
pyva/pyva/src/main/python/limitserv/limitserv.py
pyva/pyva/src/main/python/internets/internets.py
pyva/pyva/src/main/python/limitserv/limitserv.py