Merge branch 'master' into smartx
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 19 Aug 2014 12:45:33 +0000 (14:45 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 19 Aug 2014 12:45:33 +0000 (14:45 +0200)
commitafd7e45b81d6c2441b06b1bb8559a5264c690ddc
tree57ecdb3e15bf0a3fc260ed74fa0713e237a8d3ac
parent819827f5f79bede26482a1cff85f56fa90982576
parent074b2fde2b5ccffbc55b04f7c1a4ec3a3da832dc
Merge branch 'master' into smartx