Revert "- rebase against master branch"
authorDenis Ovsienko <infrastation@yandex.ru>
Mon, 18 Nov 2013 12:33:27 +0000 (16:33 +0400)
committerDenis Ovsienko <infrastation@yandex.ru>
Mon, 18 Nov 2013 12:33:27 +0000 (16:33 +0400)
commit313e526c90194ae03aca2ff6f9c5c6b63589ca7a
tree19ad5152023db2d1dfc4b5c723e20a516a5aa65e
parent90bf175584ff9b815e52c1d5de8712cf9be3d7f9
Revert "- rebase against master branch"

This reverts commit 6a40d076dea1442abe4f32bd48b9534e2029e7b0.

Conflicts:
ChangeLog
wwwroot/inc/upgrade.php
ChangeLog
README
README.patchpanel [new file with mode: 0644]
wwwroot/inc/popup.php
wwwroot/inc/upgrade.php