Merge branch 'master' of https://code.grnet.gr/git/pithos-macos
authorMiltiadis Vasilakis <mvasilak@gmail.com>
Fri, 9 Mar 2012 17:09:24 +0000 (19:09 +0200)
committerMiltiadis Vasilakis <mvasilak@gmail.com>
Fri, 9 Mar 2012 17:09:24 +0000 (19:09 +0200)
commitc61fa75cea600df78f47ba94a03bbcbe78b45274
treed3a528877992357b59154deb220a691058a8cd6a
parentf2ef6c3ab225fa6b9b546fe8b4f84a94c758f19f
parente290f7490528137675e3954c7da359686f05d2ea
Merge branch 'master' of https://code.grnet.gr/git/pithos-macos

Conflicts:
pithos-macos/pithos_macosAppDelegate.h
pithos-macos/en.lproj/MainMenu.xib
pithos-macos/pithos_macosAppDelegate.h
pithos-macos/pithos_macosAppDelegate.m