Squashed commit of the following:

commit 14cca9dacc6e4b8bc6742e8767d03276e0e57da3
Merge: 694a546 5a144f2
Author: Denis Dydychkin <nyrl@mail.ru>
Date:   Thu Jul 17 16:10:24 2014 +0400

    Merge branch 'file-line' of https://github.com/nyrl/trash into file-line

commit 694a546ec677f0b155aee3211fa4654849cacceb
Author: Denis Dydychkin <nyrl@mail.ru>
Date:   Thu Jul 17 16:07:10 2014 +0400

    Added filename

commit 239d8e859cb2a165e953791dd88eb4fb2087780b
Author: Denis Dydychkin <nyrl@mail.ru>
Date:   Thu Jul 17 16:08:37 2014 +0400

    Bug2fix

commit 5a144f2f2ac80dca4cdeb6d16ec6cdd158a3dc67
Author: Denis Dydychkin <nyrl@mail.ru>
Date:   Thu Jul 17 16:07:10 2014 +0400

    Added filename
Bug2fix2
Merge branch 'bug2' of https://github.com/nyrl/trash into bug2