Viewing all changes in revision 52.
- Committer: Luis Rodriguez Gonzalez
- Date: 2013-07-23 21:52:06 UTC
- mfrom: (50.2.1 lp_zorba_archive-module)
- Revision ID: kuraru@gmail.com-20130723215206-56zji81ip7i9asq1
Merge with trunk and resolved conflicts
expand all
collapse all
added
removed