labofsahil/github-event-dataset-2012 huggingface dataset:
get rid of 2.1 enhancements section -- probably causing pdflatex issues because we have no enhancements

git-svn-id: http://svn.osgeo.org/postgis/trunk@9883 b70326c6-7e19-0410-871a-916f4a2858ee
Mislabeled function (raster missing new flag and ST_ASGML mislabeled as new instead of enhanced)

git-svn-id: http://svn.osgeo.org/postgis/trunk@9884 b70326c6-7e19-0410-871a-916f4a2858ee
scrolling ftw
fix: FreeBSD compatibility

 Thanks to John Balwin's awesomeness.
 http://people.freebsd.org/~jhb/mcelog/memstream.c
Checked and restore
added contact privacy pml
changes by review
add mini2440 study documents
more on lambdas and blocks
Github fork icon
Added gitignore again

Ignoring .DS_Store on mac
Revert "Added gitignore again"

This reverts commit 402cf1caf0097e20cffc3d51da1d36ce521f81f7.
Revert "Github fork icon"

This reverts commit 10c576e3c5614cca64ca64a580a3df93ba251ed6.
Another try on adding the github icon!
Removing uneccessary local override
Merge pull request #70 from michellesanver/master

Github icon
added bestn in intersect() method
implemented joined decoding for indexedpatternmodel
Added events and choices. Voting works.
Последний комит на сегодня. Изменение фона через команды
fixing the pairing tests
removed scripts, added framework
Fixes typo on the french translation of the about page
Merge pull request #49 from djoume/typo-french-about-page

Fixes typo on the french translation of the about page
working in progress, ditch the links for now
add fix and test for put to PROC field (a 1-element CHAR array that wants an integer input)
Fixing PHP 5.4 E_STRICT errors in domains module model.
Fixing some PHP 5.4 and MY_Model compatibility issues in the domains module.

Fixes #1841.
Fixed issue #1429: Navigation cache HTTPS bugs.
Previously if a page was loaded in HTTPS which set the cache, the links would all be sending users who had no interest in seeing HTTPS pages there anyway, which sometimes would break things.
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/develop
Add Thai language translation

translate CMS, CI, CKeditor
Update system/cms/modules/streams_core/language/italian/pyrostreams_lang.php
Update dutch installer
Dutch languages translated in several modules
Corrected typo in the files plugin
Fixed "list-tag" typo in pages plugin. Closes #1344
Merge pull request #1349 from patrickkivits/2.1/develop

Translated several modules to Dutch
Fixed a couple bugs in the Pages plugin that were introduced by changing the return type of page_m->get() to an array. Closes #1341
Merge branch '2.1/develop' of github.com:/pyrocms/pyrocms into 2.1/develop
Fixed Lithuanian translation
Updated Arabic translation
Merge pull request #1345 from ChristianGiupponi/patch-1

Update system/cms/modules/streams_core/language/italian/pyrostreams_lang...
Added several methods to the template plugin so that page title, breadcrumbs, and metadata can be set from within page content.
Merge branch '2.1/develop' of github.com:/pyrocms/pyrocms into 2.1/develop
Removed unused pyro.lang.delete as it was causing IE to pitch a fit
Merge pull request #1354 from okhayat/2.1/develop

Updated Arabic translation
Merge pull request #1353 from huglester/17df60cae3624c1fba98a4fc459b804c9bf965c6

Fixed Lithuanian translation
Merge pull request #1339 from nateetorn/2.1/develop

Add Thai language translation
Removed iPad from the mobile array of the user_agent config file. It will now load the full version of a site as our documentation states it will. Closes #1338
Merge branch '2.1/develop' of github.com:/pyrocms/pyrocms into 2.1/develop
Configuration.initialize is now Configuration.loadConfig.
The old rpmt-py and spma
Merge pull request #2 from piojo/master

List spma-old and rpmt-py in the release
add a push line to master
edit from branch
move to standalone repo
support user defined tags
Switched over from M/s to KM/h for wind_speed
guardando pequenas alteracoes
add arquivo de GUI
alteracoes da isadora em tela e interface
tirada atualizacao autom. do remover
Merge branch 'isadora'
pequenas alteracoes na interface com o bd, sql novo

novo sql, contendo DML alem de DDL (okey, o nome tem ddl... ignore!)

pequenas alteracoes de grande importancia: os DATA_ARRAY_T agora nao faz mais
parte do MANEJA_TABELA, pois a funcao de pegar dados, dentro do Java, da
execucao de uma procedure, nao sabe lidar com pacotes...
doc: create PO file for Japanese with packnga 0.9.7

TODO: translate and resolve fuzzy after 2.1.0 entry is added to news.textile
Add Groonga::Normalizer.normalize

Note: Groonga::Normalizer is experimental.
append to dom once only after all tree building
added fallback for better info if not language object
Merge branch 'master' of github.com:rapila/cms-base
prompt revisited
can define a image from a fraction of e raster file
creation text,image, selection part 1
update
update
Removed .secrets
Fixed issues with the button visibility not changin on start-up
Adjusted Controller_Template to phpcs standards.
increment version number to 0.4.0
Added a list styling to reduce indent of nested table of contents
修改配置文件的一点点错误
再次上传   修正check错误
delField event triggered with item and index args
each helper, del by index
Merged r9738, r10135 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@10301 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r10147 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@10302 e93f8b46-1217-0410-a6f0-8f06a7374b81
Russian translation for 2.1-stable updated (#12021)

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10563 e93f8b46-1217-0410-a6f0-8f06a7374b81
gantt: code layout cleanup to_image method of lib/redmine/helpers/gantt.rb

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10353 e93f8b46-1217-0410-a6f0-8f06a7374b81
gantt: code layout cleanup image_task method of lib/redmine/helpers/gantt.rb

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10354 e93f8b46-1217-0410-a6f0-8f06a7374b81
gantt: use content_tag instead of html tag at the task bar

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10355 e93f8b46-1217-0410-a6f0-8f06a7374b81
Norwegian translation for 1.4-stable updated by Ketil Mehl (#12605)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11014 e93f8b46-1217-0410-a6f0-8f06a7374b81
Norwegian translation changed by Ketil Mehl (#12605, #12608)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11015 e93f8b46-1217-0410-a6f0-8f06a7374b81
project manage
ticket access control
gerada aplicação exemplo
- some more data entries
Merge remote-tracking branch 'origin/master'
nuevos cambios javi
[doc] Add documentation to setup the project.
subsystem XML readers should not be extended
AS7-5753 Replace Infinispan subsystem virtual-nodes attribute with segments attribute
AS7-5753 consolidate deprecated attribute log messages
Added pt_BR language (Brazilian)
Merge pull request #105 from ruanmer/master

Added language: pt_BR (Brazilian)
- Add demo for including meta boxes for specific post IDs and page templates
- Taxonomy field is now in core
ENH: optimize: add _minimize_lbfgsb function with standard signature

`fmin_l_bfgs_b` now calls this function. Backwards compatibility should be
preserved. The case of `func` returning both the objective function and its
jacobian is treated in `__main__`.
BUG: Fix circstd and circvar and add tests.
Merge remote-tracking branch 'upstream/master'
ENH: Add axis keyword to circular statistics calculations and generalize the functions.  Use assert_allclose in tests.
BUG: io: add work-around in netcdf.py for the bug in numpy that is the cause of the problem reported in ticket #1202
BUG: sparse.linalg: add re-entrancy checks to fortran-based solvers (#1426)

The iterative REVCOM solvers use SAVE variables, and are therefore not
re-entrant. Add checks to catch if someone tries to call them nested,
since in those cases the solvers may produce garbage as output.
Merge pull request #141 from WarrenWeckesser/ticket1202

BUG: io: add work-around in netcdf.py for the bug in numpy that is the c...
BUG: cluster: 'linkage' C function in hierarchy.c did not check the return
value of malloc, which could lead to seg faults. This commit is a rebased
version of https://github.com/scipy/scipy/pull/110
Closes ticket #1562.
WHT: whitespace clean up of some fortran code to prevent gfortran warnings (convert tabs to spaces, remove some trailing whitespace)
ENH: integrate: add 'initial' kw to cumtrapz, which makes len(out) == len(in).

Default is initial=None, to be backwards compatible
(meaning len(out) == len(in - 1) along axis of integration.

Also add tests and a decent docstring.

Closes ticket 1574.  Reviewed at https://github.com/scipy/scipy/pull/125.
BUG: Some macros require trailing semicolons for Numpy 1.7.

In Numpy 1.7 some macros have had their trailing semicolons removed
in the include file, hence require them in the source.
ENH: add Dag Sverre's cythonize command

./tools/cythonize checks for modifications in pyx files relative to the
corresponding c file, and updates the c file if it detects a mismatch.
DOC: interpolate: document the `w` parameter of splprep.
DOC: stats.distributions: update discrete example.  Closes #1421.
DOC: stats.distributions: slight rewording of hypergeom example.
BUG: sparse/arpack: use only double-precision routines if running on OSX

There are currently unresolved crash-bugs with OSX's Veclib in the
single-precision routines. This commit brings in a temporary workaround
to allow us to proceed with the 0.10.0 release.
MAINT: arpack: disable single-precision eigs/eigsh routines on all platforms.

Failures, hangs and crashes have been reported on both 64-bit OS X and multiple
Linux systems.  Until the cause of this is found, these routines should remain
disabled.
STY: Replace macros in old_define.h with new versions.
STY: Remove support for versions of numpy < 1.
STY: Remove support of numpy < 1 and update macros in old_defines.h.
On xapi start, also plug VLAN PIFs with IP configuration

This ensures that the state of all PIFs that are configured by networkd
when the hosts starts (before xapi) gets updated.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Removing debug line.

Signed-off-by: Rabin Karki <rabin.karki@citrix.com>
Merge commit 'e51457b958d4a1c06bda8a6b51d2a6ba8f18a04e'
Implement the reading of the metrics with Linux Bridge and OVS.
Fix an off by 1.
Implement the alarm for status change of a bond.
Add a "links_up" field in Bond object.
Minor clean-ups
Improve alert message.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
Improve assert_homogeneous_vswitch_configuration on pool join

This assert only blocked openvswitch hosts to join bridge pool,
and not the other way around. According to the original commit
message, that was not the intention.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Nm

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Xapi_pif

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Create_misc

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Vmops

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Helpers

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Mtc

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Dbsync_slave

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Xapi_network

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Xapi_network_real

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Xapi_host

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Stop using Netdev module in Xapi_pool

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
write backend key
networkd: move types and defaults to interface file
networkd: use make_config to configure interfaces and bridges in Nm

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
make bridge_create less destructive
move mtu and ethtool settings for management interface outside create_bridges
do not depend on backend type in Nm
Combine Bridge.destroy calls

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
clearly split infrastructure setup and management IP configuration
[Issue #89] fix button color
use gcc -Wsign-compare option
added basic shell code to invoke shell commands
rename menu-cache
add menu-cache explicitly to lxde meta pkg
utils/write-hd-image.sh: make --clear-builds work
butch build template: keep track which tarballs were used
butch build template: also relocate /libexec
kernel boot: ask for vga mode
add dejavu font
xorg: depend on dejavu font
lxde: depend on lxpanel
pango: generate module list
tune X for lxde and QEMU
untracked history

Signed-off-by: Ronert Obst <ronert.obst@gmail.com>
ignored eshell history

Signed-off-by: Ronert Obst <ronert.obst@gmail.com>
Makefile Bugfix
Support python version checking for south.migrate
Replaced a Moq test with RhinoMocks to try it out
index.php's genWebQual.sh calls now deal with whitespace properly too
print warning if Rtools on the PATH is not compatible with the current version of R
Added models.js
Added 'add box' function, implemented box flipping, and tied in jQuery Masonry plugin.
Remove HN link and partial-ize contact_list
Use fixed header and re-organize javascript
Update google_prettify theme
Update doc table of contents
Load local jquery as backup
Update content
Update papers/AuthorKit/semantics.tex
Commiting all my previous work
When an exception happens, ensure the display is on.

Signed-off-by: Russell Steicke <russells@adelie.cx>
really fixing ip this time
fixed redis ip & dynamic displayName
[bug fix]heroku cannot save img
[bug fix]display image with db save
[add function]display image at index page
Revised checks on moments and return values.


git-svn-id: http://svn.boost.org/svn/boost/trunk@79769 b8fc166d-592f-0410-95f2-cb63ce0dd405
Revised checks on moments and return values

git-svn-id: http://svn.boost.org/svn/boost/trunk@79770 b8fc166d-592f-0410-95f2-cb63ce0dd405
1355135584
Merge branch 'master' of github.com:s5unty/dotfiles
[Fix] FOEを倒したあとのマスでメニューが開けないバグ修正
[Fix] FOEを倒したあとのマスにシフト移動ができないバグ修正
[Add] 踏破率の計算機能追加
Disabled asset pipeline
Updates to asset pipeline conf
Added edit/remove modals for playlists, fixed corner cases in UI logic
Added (simple) coverage file
Merge pull request #45 from jaytaph/gcov

Added (simple) coverage file
Backporting from trunk (rev# 9461):
* On some Solaris systems, the iov maximum buffers number is 16. However
rtpproxy tries to send more, therefore the communication fails. This fix
prevents these cases by concatenating the last buffers.
 Credits go to Nathaniel L Keeling III for reporting and providing testing
environment

* added -n flag in documentation
I changed a few things, added a little more exception handling to avoid crashing and hopefully made things a little bit more Pythonic. I am concerned that a few changes may make things seem a little too cluttered(if two cases can be handled with one exception catch, does that make it a better way to handle things? Or does it make it more ambiguous as to what the actual error was? I went with the second option, but I'm not 100% sure).
Fix index range bug
+
OpenSceneGraph:

 * update to 3.0.1 which fixes a build failure with the current version of curl
 * blacklist clang to fix build failure (http://lists.macosforge.org/pipermail/macports-users/2012-September/030412.html)
 * add patch to fix build on Lion and up (http://forum.openscenegraph.org/viewtopic.php?t=9001)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97313 d073be05-634f-4543-b044-5fe20cf6d1d6
hunspell: fix livecheck; rewrite master_sites to avoid redirects


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97314 d073be05-634f-4543-b044-5fe20cf6d1d6
webkit-gtk: Fix build with gcc-4.0


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92056 d073be05-634f-4543-b044-5fe20cf6d1d6
geda-gaf: fix build failure with glib 2.32; see #34194 (maintainer timeout)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92697 d073be05-634f-4543-b044-5fe20cf6d1d6
libgda: fix build failure with glib 2.32; see #34242 (maintainer timeout)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92698 d073be05-634f-4543-b044-5fe20cf6d1d6
VLC: Use clang to build VLC on Leopard.  Disable x86_64 on Leopard.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92699 d073be05-634f-4543-b044-5fe20cf6d1d6
libgda3: fix build failure with glib 2.32


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92700 d073be05-634f-4543-b044-5fe20cf6d1d6
py-mysql: rename +mysql5 to +mysql51, add +mysql55, drop support for
mysql*-devel versions providing mysql_config.

Revision can be bumped when mysql51 and mysql55 are offical and mysql5
is replaced_by mysql55.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@94476 d073be05-634f-4543-b044-5fe20cf6d1d6
py-mysqldb: simplify reinplace on files/patch-site.cfg.diff.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@94477 d073be05-634f-4543-b044-5fe20cf6d1d6
qalculate-gtk: add license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95158 d073be05-634f-4543-b044-5fe20cf6d1d6
qalculate-kde: add license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95159 d073be05-634f-4543-b044-5fe20cf6d1d6
remove these ports, not developed nor maintained upstream anymore for a long time


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95160 d073be05-634f-4543-b044-5fe20cf6d1d6
shogun: add license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95161 d073be05-634f-4543-b044-5fe20cf6d1d6
tablix: add license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95162 d073be05-634f-4543-b044-5fe20cf6d1d6
stp: add license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95163 d073be05-634f-4543-b044-5fe20cf6d1d6
ntl: add license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95164 d073be05-634f-4543-b044-5fe20cf6d1d6
surf: add license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95165 d073be05-634f-4543-b044-5fe20cf6d1d6
Deprecate ext/mysql.

Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Deprecate ext/mysql.
added Battery API
added Object.observe() and word-break: break-word;
asset pipeline hell
Fix Crash Updating un-discoveredDevice while at DetailObjView
Took code base from twitter bootstrap korean, and migrated it to our website.

Since I had formatting issues, I took base code from twitter bootstrap
korean. So the original stuff is gone. I started mocking up an initial
design too.
fedora screenshots
fixed playlist z
Fixing security group create success message.

Fixes bug: 1009260

Change-Id: I2eb546450f24ffa44334c02f6a1b96c7502a6ee9
Change tenant to project in python code to match templates.

Fixes bug: 1009263

Change-Id: I8e57d3d294f3a9346c7ae2161b7a0381fbf536ea
Adds a summation row option to the datatables.

Implements blueprint summation-row.

Change-Id: I81c984bbf830182854e8f2227e6eae8909e91eef
Added metadata for server

in server Overview page

Fixes bug 993133

Change-Id: Ie386d4d6d3786c53fe547eed91c4c3fd8c224cd8
Changed project uuid to project name

in overview page, to keep consistency in
display views. At the moment UUID is only shown
for Detail views, and for Project/Users tables
in Syspanel, as there are no detail views for them.
Also a table caption was changed from Tenant to Project Name

Fixes bug 999392

Change-Id: Ie998d66d78fca713c33f61d2f62484e511097bf3
Added a check for attachment['instance']

The problem, described in the ticket occurs
while you try to attach a volume to instance,
while at the same time terminating the instance(
I've succeeded to reproduce it that way).
As seen from the stack trace - the error comes
after an AJAX call for updating the table rows.
In normal situations with loading the page,
this error should not appear. Anyway, now there
is a check to prevent this error.

Fixes bug 999502

Change-Id: Ifccc2cf724fe14098c74b55e65f8fbdd8c5434dc
Improved floating ip assocation via workflows.

Implements blueprint floating-ips-workflow.

Change-Id: I2b850aa0f3e8f4e11d9bd94c97e1dc4336fa5bb1
Merge "Improved floating ip assocation via workflows."
Added some identifying classes to detail page sections.

Makes for easier styling. A little cleanup for consistency is
also included.

Change-Id: Id5492ed61fcc93ad83e7142c7840a462bf8f9e85
Glance remote image creation.

Implements Blueprint image-copy-from

Change-Id: I373301b5020d49c78fdba2bcf10c5cc4e05686ef
Merge "Changed project uuid to project name"
Merge "Change tenant to project in python code to match templates."
Merge "Added metadata for server"
Merge "Added a check for attachment['instance']"
Re-enabling client-side table sorting on a basic level.

Fixes bug 1009677.

Change-Id: I8a1fc225432ea868bb751f261ed69c8d045ceb55
Merge "Glance remote image creation."
Add Swift pseudo-folder support to Horizon.

Implements blueprint swift-folders.

Change-Id: If29ad3cc1fcfb9b7bdb66d915a667f3363d38da0
Prevent erroneous log message when accessing security rules.

Fixes bug 1009797.

Change-Id: Ic8f627610b235c5d71a210800b3318619715106e
Some tablesort style tweaks.

Change-Id: I75bb2b85d27d0beb9e2316118268e746ec6ba1d1
Only sort on sortable columns.

Also some generic cleanup.

Change-Id: I7b4f27a5d25204f2356bb1189dc252a65f83332e
Initial commit
Initial loading

Compile OK
Initial loading

Compile OK
Complete description
Signed-off-by: Stephane Aubry <saubry@japotrad.com>
Debug+unit test+doc class Iu.
Head of package documentation
Unitary test for Sn class
Improve unit test coverage and documentation.
Improve documentation and unit test
New
Correction
fixed readme.md, for reals this time.
degs-of-sep
Ur/Web 20120925

Closes #15099.

Signed-off-by: Austin Seipp <mad.one@gmail.com>
Closes #15099.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
imageworsener: add libpng dependency

Without this, imageworsener is very limited as
it can not write png files

Closes #15089.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
git: also install git-subtree

The git-subtree formula was removed by b3a0a433c, as subtree is now
delivered with mainline Git. This commit ensures subtree is available in
the default install. The manpage is not installed.

See #12897.

Closes #15085.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
nginx stable 1.2.4

Closes #15101.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mongodb: fix hash for --32-bit

The 2.2.0 32-bit binary that 10gen published wasn't compiled as intended.
They re-built and pushed out a new binary, so this is the hash of the
new binary.

https://groups.google.com/d/msg/mongodb-user/KfsEskSEJi0/NMjWrI77L-8J

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mongodb: --devel 2.2.1-rc0

Closes #15102.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
dnscrypt-proxy 1.1.0, -HEAD and plugins

Closes #15088.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
gearman 0.39

Closes #15096.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mariadb: fix shared data dir and my.cnf includedir

Fixes #15071.
Closes #15094.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Clean up and improve build-error output and logs

All logs are now stored from each command executed in Formula.install.

Error output is truncated to five lines in an attempt to not overwhelm the user and to encourage users to read the error output and report the bug properly. Maybe we can get that figure up from 70% to 90%.
MercurialDownloadStrategy can find hg again

Was broken after superenv PATH modification.

Fixes #15078.
Determine SUPERBIN correctly
Don't unset DEVELOPER_DIR if set
ENV.fortran adds back superenv removed PATHs

Fixes #15103.
Sinan 4.1.1

Closes #14093.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
chuck 1.3.1.2

Closes #15091.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Merge branch 'master' of git://github.com/mxcl/homebrew into tiger
Bundle 'simple numbers' and 'bit-ops' tests.
Merge pull request #14 from aking/update-math-tests

Bundle 'simple numbers' and 'bit-ops' tests.
Updating contractor to use new brightbox ruby 1.9.3 package!
Added error.
Merge branch 'master' of github.com:scravy/Hydrogen
Greatly enhanced usability of console.
TINSEL: Fix misleading comment

I missed these in my scroll wheel pull request, but better late
than never.
modi pg
add user on posts
Added file hello.h

Change-Id: I7e5c372b2fd78b2d94e05af2968e8419f283b6fb
Fix: problem in alive connection
Merge branch 'master' of https://github.com/sdsk8/pybukkitr
Fixed the README

I only just realised that GitHub only displays READMEs in markdown
if the file ends in .md

Created a GitHub-only README.md, and restored the old README.
Moved this into character.cc
Looping moves now work
Made more stuff work based on looping
Merge remote-tracking branch 'origin/testing' into alpha
Consolidation
Small modifications
First attempt at saner unit collision. Currently not saner, also broken.
Mostly fixed! Now just to resolve the weird edge case where players are being pushed to the corner...
Removed deprecated variables.
Merge remote-tracking branch 'origin/testing' into alpha
Specialcasing some collision stuff in the hopes that it works.
Now with less unnecessary updating
Updating report/solutions.txt to add the info about commits
增加静态资源不同环境的静态变量配置模板
Button zum Speichern der Strecke hinzugefügt + Persistance Klasse zum Speichern einer Strecke auf der SD-Karte
BIG MERGE, Attention: Deleted Prototype!
disable windows split and don't start server if emacs runs as daemon
Improve figure download with visual cues.
Adding ability to pass a callback filter so you can process the request before it's returned
add readme

要修改的，再有人看之后，呵呵。。。
refactor
Merge pull request #2 from andrzejsliwa/master

refactor
Signup user and prepare for activation (mailer)
Further styles adjustments to index pages
added simple notes management to administration section
revised the README for getting nodeGame up and running on UNIX
Allow specifying the bootclasspath by the bootclasspath.java5 and bootclasspath.java6 variables
Only show warnings and errors when building javadoc
Sign artifacts during the verify phase (breaks the repository:bundle-create goal, but it had other issue anyway)
spell mistakes, added new comment
Add symbolic links to RabWii documents
Project definition updated
serv config
use conditional expression.
Agregamos validadores a la creación de usuarios.
Treat COM unit test failures as build errors by default

Allow alternative behaviour (eg for continuous integration) to be specified
externally, by setting BOOST_UNIT_RESULT_CODE=no in the environment

Change-Id: Ib60a7808c92134c27c64e01522b87a3cd25f17f7
a bug fix in QCD::Mbar2Mp().
Complete Chapter 1 Lesson 1 Ex 2
Adds my ZSH configuration
Changes to gallery vid section
statuses.css: Set max-height to keep aspect ratio.
Fix the bug last_page_num status=1 and count > 0
Update CloudTab.html

In this file I tried to append one more button for uninstalling apps from chrome store.
I am not able to test this properly.Please check on ur local.
Move to personal namespace
Few minor snow bug fixes.

Signed-off-by: me4502 <mnmiller1@hotmail.com>
Add language to POM.XML for Vehicles
Fixed potential bug where Thaw/Snow Operation.resume() would go through multiple columns instead of stopping after the first.
Scratch buffer keys.
Implement arbitary diff
FSAA with multisample now working
tweak
finished
http redirect export
Attach label and milestone when creating the issue
Fix label color on diff theme
cope with haxe changes
quick fix
Merge branch 'master' of https://github.com/smcdon/HManager
Set up functions
简化touch检测的接口
解决手势和普通touch事件的冲突
Now supports 2.5.1!
Change Help CSS
Change .gitignore nbproject
Add TP3 patches
Add implementation for substraction

The test scenario for substraction and the implementation were added. Test
is in the feature directory as usual and the implementation is very similar
to addition.
Added implementation for multiplication as usual
Add test and implementation for duplication op
Basic check for empty stack

Check stack is not empty before a pop, throw an error otherwise
Merge branch 'tp2' into stack_dup
Add STACK command for debug
Merge branch 'stack_dup' into tp2

Conflicts:
	features/simple-operations.feature
	lua/forth
Added division
Revert "Added division"

This reverts commit f065d1441ac041acb4125b46c9562461e7ab4461.
Added test for multiplication and addition in the same operation
Merge tag 'tp3/patches' into tp3

tp3/patches
Implement Forth conditions and comments

Conditions and comments works by overriding the execution loop.

Comments override the execution loop starting on ( and until ) where
they restore the original loop.

Conditions override the execution loop on IF. At that point the top
element is popped and if it is true, the execution continues normally
until ELSE and then execution skip to after THEN. If the element is
false, execution is skipped until ELSE and THEN finishes the condition.

Code example are as follows:

    ( This is a comment )
    ( Don't forget the space after the brace )
    ( And this is a condition )
    1 < 2 IF TRUE_CONDITION ELSE FALSE_CONDITION THEN

The only problem is that we haven't implemented comparison operators.
That's why the tests fails.
Implement missing integer comparison operations
Implementing new word definitions and words NOP DUP and DROP

Word definitions start with ":" and end with ";"
It is implemented by overriding the executing loop after ":" to record
the words that are read and generating a function inserted in the symbol
table.

The following new words are also introduced:

NOP: does nothing
DUP: duplicates the last element on the stack
DROP: pop the last element on the stack and discard it

Conflicts:
	lua/forth
Implement EXIT
Implement VERSION
Implement VERSION
Revert "Implement VERSION"

This reverts commit 3ee4e80bbf9479b7d9b4a3642585c3fba106e1fa.

Conflicts:
	lua/forth
Fixed EXIT command
[vim] massive clean-up (removed unused pluins, add new ones, remove obsolete settings etc.)
Merged Maven module with parent POM in preparation of build conversion to Ant.

[Issue(s) CIAPI-153]
Converted build from PHP Maven to Ant.

[Issue(s) CIAPI-153]
forgot to push with new content
Removing paid hours
Fix for OpenSSL key verifying #1550
FIrst detect tablet devices, then detect mobile devices. Fixes #1526
Add of the rc.lua fileconf for Awesome and wm-scripts that are used by Awesome.
Added Rubik theme and tao theme
Some automatic work changes:
1. Setting autoread so that external changes auto load.
2. Extended the stripping trailing whitespaces & writing all to files without extensions.
3. Enabling per-directory .vimrc files.
Added the ability to select regions in Ruby (e.g. vir, var)
add: basic handling of graph lifecycle
Upload Olympic data and show description in XML so it can be displayed in opening times
images tab loaded
relace with StringUtils.isEmpty()
Update DIFF to specify chromosome/pos in ZP as a string.
Update Recab to make the matches/mismatches the default and not logistic regression
Merge branch 'dedup' of github.com:statgen/bamUtil into dedup
OPENCIT-153: Attempt to work around the persistence issues
Fix header data in test.
minor memory leak fix
added fann_create_train_array to create train_data from array
added another function for setting training data
fixed compiler warning
Merge branch 'master' of git://fann.git.sourceforge.net/gitroot/fann/fann
tipe-b
patch,clean
Prefixes and colored chat! :D
Failed to commit many files before
fix confuse with gsutil homedir permissions
ThirdBody kinetics now use arrheniusLow attribute (not arrheniusHigh).

Third-body kinetics are used for reactions that are treated as if always
in the *low* pressure limit, not the high pressure limit. Therefore, it
is more correct to use arrheniusLow instead of arrheniusHigh as the
attribute storing the Arrhenius kinetics in the low pressure limit.

This change was made by simply swapping the arrheniusHigh and
arrheniusLow attributes of the ThirdBody and Lindemann classes, and
updating the appropriate references. What unit tests exist were also
updated (and all still pass).
Use correct units for ThirdBody et al. when loading old database.

This updates the function for loading the old (RMG-Java) database so that
it correctly parses ThirdBody, Lindemann, and Troe reactions, including
using arrheniusLow instead of arrheniusHigh for ThirdBody reactions -
now detected using the +M species - and using one reaction order higher
to assess the units of the low-pressure limit expressions. I was able to
re-import enough of the old database to show that this seems to work as
intended.

Closes #96.
Updated Chemkin file reader and writer to use ThirdBody.arrheniusLow.

Other than that, the Chemkin file reader and writer were handling the
third body reactions correctly.
Merge branch 'master' of github.com:GreenGroup/RMG-Py
Minor type fixes to rmgpy.molecule.draw

Drawing of polycyclics is still very buggy, but at least they will
now draw without error.
Config Acessor Add
enhance gundo; add webapi; remove unused bundles
테스트 주도 개발 2장
emacs: config for 24.1
zshrc: add git completion settings
GTK3: fix drag and drop on dbman


git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20109 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Added class id to all tab labels

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20111 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Replaced /usr/share with /usr/local/share for resources\' destinations.

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/geps@19447 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Added Random Data
cleanup
deleted files
some more cleanup
removed spring security
about to add apache shiro
Ensure high quality resizing for JPEGs.
widgets
merged with github
added Json.parse

git-svn-id: http://haxe.googlecode.com/svn/trunk@4259 f16182fa-f095-11de-8f43-4547254af6c6
make sure file times for dependencies get updated

git-svn-id: http://haxe.googlecode.com/svn/trunk@4305 f16182fa-f095-11de-8f43-4547254af6c6
Add stuff that wasn't there
[Process][Tests] fixed chainedCommandsOutput tests

for OS where echo does not support -n option (like MacOS X)
merged branch tucksaun/fix-process-tests-osx (PR #6072)

This PR was merged into the 2.1 branch.

Commits
-------

0f4d8af [Process][Tests] fixed chainedCommandsOutput tests

Discussion
----------

[Process][Tests] fixed chainedCommandsOutput tests

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes (previously no)
Fixes the following tickets: -
Todo: -
License of the code: MIT

Currently, if you run the Process Component tests on an OS where echo does not support the -n option (like MacOS X), they will fail.

This PR fix that by using only a simple echo which is universal.
[WebProfilerBundle] fixed composer.json and added missing PHPUnit configuration
updated vendors for 2.0.12
updated CHANGELOG for 2.0.12
update CONTRIBUTORS for 2.0.12
updated VERSION for 2.0.12
moved root files to data
symlinks
upd
update
squeese splitting funtions

git-svn-id: svn+ssh://svn.kde.org/home/kde/branches/work/kst/portto4/kst@1320970 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
don't change location while reading with threads

git-svn-id: svn+ssh://svn.kde.org/home/kde/branches/work/kst/portto4/kst@1320971 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
give a hint when realloc fails

git-svn-id: svn+ssh://svn.kde.org/home/kde/branches/work/kst/portto4/kst@1320972 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Qt5 fixes: QVariant is now in QtCore

git-svn-id: svn+ssh://svn.kde.org/home/kde/branches/work/kst/portto4/kst@1320973 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
340.07 imtermediate checking - working on generalized message handling
Added default positioning. Added error logging.

You can successfully send a positioning object into the constructor.
This makes it possible to choose a specific box as start box.
Error logging is now available, but this function is currently working
for box_exists() only. More coming soon.
Updated docs related to score config
udev: net_id - update examples
commit with serverjs
Updates documentation from dcd2d520c29dc65a634c8e956dec0333c19f6aac.
Implement code for localized_font_name flag

This requires fontconfig > 2.9.0 to get it working properly
requires Arduino 1.0.1, removed comment about odot not being mac compatible
ログイン制御
Update lib/Tivoka/Server/Server.php
模仿path
Converted to vs2012 RC

Signed-off-by: Alexander Lukyanchenko <lukyanchenkoam@gmail.com>
removed unnecessary time.h include
File moves
Added README
added cropbox command for cropping normal PDF files.
Remove EventChangeLog. Added reversion app to track changes in events. Handle changed events in twitter and feeds.
Fix test
remove variable mouseIn
RecordSelection
Merge remote-tracking branch 'origin/master'
New schoolyear, new package.
save_win_size
Add HTML5 plugin
Mapping for close all buffers
Implement independent RF and static fields

First step to efficient implementation of arbitrary time dependent
boundary conditions. Now needed for modelling of RF octopole
in homogeneous external field.
Make configuration for model of OH_NEG in HAITRAP
Update kaminari, generate config.
OSC Redirects
Finished Show Pages

The CP is almost done
Add root rotue
added note: need to install scipy as well
fixed spelling mistake
start on a UI for reverting edits
Udated some lines in the changelog
Added the ACRA library as a new dependency
Added code to initialize ACRA and use it if a crash happens
Fixed a bug which caused that the widget showed the main window just once
Updated the format of the changelog
Migrated the changelog script from 'Meine Mediathek'
Added a missing reference to the crash dialog
Implemented a new method for showing the changelog
Updated the text of the license dialog
The changelog will now show the days since a release of a version
Updated the release date for the next version
Fixed a typo in the changelog
Updated the ProGuard mappings for the next release
revert package.json changes
tested bootstrap and haml
Merge branch 'master' of https://github.com/timko/StudyBear
added discussion model
dirty working tree
Fixed counting in README :)
Fixing setUp and tearDown properties
Added required_with validation rule to conditionally require an attribute based on the presence of another attribute

Signed-off-by: Jason Walton <jwalton512@gmail.com>
NOT NULL order issue fixed!

thanks @crynobone !!!
unique typo
Allow filter patterns to supply a name and callback as an easier alternative.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Updated the documentation.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Merge branch 'feature/installation'
Allow for passing variables to views with more expressive method calls.

Example: with_foo($bar) instead of with('foo', $bar)

Signed-off-by: Franz Liedke <franz@develophp.org>
Fixed the spaced directory when calling php unit via the command line

Signed-off-by: Luca Degasperi <dega.luca@gmail.com>
Using escapeshellarg instead of putting backshlashes in front of spaces

Signed-off-by: Luca Degasperi <dega.luca@gmail.com>
Allow more than just WHERE clauses on eager load constraints.
Fix a bug with Eloquent model classes and isset() when eager loading a relationship returns an empty result set.
Added Polish translation

Signed-off-by: Tomasz Tomczyk <me@tomasztomczyk.com>
Add documentation on how to attach pivot table fields to attach command.
Hebrew Translation

Hebrew language files.
Fixes #818, wraps  in an array instead of type casting.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
docs edit: eager loading using $includes in model
Merge branch 'develop' of git://github.com/laravel/laravel into develop
removed extra newline
Merge branch 'master' of https://github.com/laravel/laravel into develop
Fixed Hebrew

Fixed and unified hebrew translation.
Update northstar.h
Simple to_s works
docs about Timestamp plugin
specify the more strict deps
more strict argument check in load_plugin
initital
Improve the README
finish static
stuff
automatyne konczenie po wybraniu drogi
a daily schedule
Changes for tile clicks to be callbacked to the canvas engine
Fix PHP warning with Advanced Search toggle, and formatting fixes.
camera: added position interpolator
added 'iso' format support to 'date' option
updated README
credit where credit is due
added ::ASA::Generator
changed ::Parser names grammar and NAME_ID token
added NAME_ID token class mapping
added names to ASA Template
::ASA::Builder to use ::ASA::Rewriter and ::ASA::Generator
removed TokenPicker.pm
Ajout segmentcontrol dans galerie
fix readme formatting
Merge branch 'develop'

* develop:
  fix readme formatting
version bump
Merge branch 'release/2.0.10.6' into develop

* release/2.0.10.6:
  version bump
initial commit for lab4
Some more labs
Commit
Make destroy_slave work on offline/stopped nodes - it cannot run RESET SLAVE, but at least if theres an asset tracker plugin, it can do its normal cleanup. This works out-of-the-box with jetpants_collins.
changes in branch1
branch2 changes
after merging
Fixed document printing. Missing # in linksource
Fixed documenting
making logging work in command, a few more log statements
animation readme
tweaked code, enabled texture fr header
libext2fs: change mmp.c to LGPL to match other files

Change the license of the mmp.c file to LGPL to match the license
of other files in the libext2fs library.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
ext2fs, blkid: localize environment-specific variables

Restructure the ext2fs_get_device_size() and blkid_get_dev_size()
code to localize the variables used for different device probing
methods.  This at least reduces the #ifdef mess to only one part
of the code for each method, and avoids "unused variable" compiler
warnings added when variables are declared without being #ifdef'd.

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
libext2fs: optimize rb_set_bmap_range()

This speeds up reading bitmaps from disk for very large (and full)
disks by significant amounts (i.e., up to two CPU minutes for a 4T
file system).

Addresses-Google-Bug: #7534813

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
e2fsck: optimize pass1 for CPU time

Optimize e2fsck pass 1 by marking entire extents as being in use at a
time, instead of block by block.  This optimization only works for
non-bigalloc file systems for now (it's tricky to handle bigalloc file
systems since this code is also responsible for dealing with blocks
that are not correctly aligned within a cluster).  When the
optimization works, the CPU savings can be significant: ove a full CPU
minute for a mostly full 4T disk.

Addresses-Google-Bug: #7534813

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
libext2fs: add ext2fs_bitcount() function

This function efficiently counts the number of bits in a block of
memory.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
libext2fs: optimize rb_get_bmap_range()

This simplifies the rb_get_bmap_range() function and speeds it up for
the case where most of the bitmap is zero.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
libext2fs: optimize rb_get_bmap_range() for mostly allocated bmaps

This optimizies the CPU utilization of the rb_get_bmap_range()
function when most of the bitmap is allocated.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
e2fsck: optimize pass 5 for CPU utilization

Add a fast past optimization in e2fsck's pass 5 for the common case
where the block bitmap is correct.  The optimization works by
extracting each block group's block allocation bitmap into a memory
buffer, and comparing it with the expected allocation bitmap using
memcmp().  If it matches, then we can just update the free block
counts and be on our way, and skip checking each bit individually.

Addresses-Google-Bug: #7534813

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Started separation of JDO from ZooDB
Introduced meta schema
Schema are now objects.
fixed db-admin test
More clean-up
新的数据结构！
- Добавлен функционал DeleteOneById, DeleteAll
- Интерфейсы объединены в общие интерфейсы IGet, IInsert, IUpdate, IDelete
- Добавлен функционал InsertMultiple
- Методы Insert возвращают записи целиком, а не только Id
some fuzzyfinder modifications
proper command t mapping
updating cds path
adding tmux conf
Saving last directory of file open dialog.
removed unique key users.reset_hash
EntityProxy support for OnSceneAdd.
Separated Task and GenericTask.
Task Proxy.
Lems 85% done
Set behat compiler in behat features
Update vim behat
Work on classic implementation
Command-T settings for itrem
ZSH - autocomplete the first match
trying npm install tarball http://stackoverflow.com/questions/8243527/use-git-dependencies-in-with-npm-and-node-on-heroku
ios
ios major revamp
ios removed slices
Merge branch 'master' of https://github.com/victorpras/OORA
test login gwt ok
Added documentation on using Melpa package archive.
Updated documentation on using Melpa package archive.
Merge pull request #8 from arbox/master

Documentation on Zotelo package in Melpa
Генератор logic_var_set - указать количество наборов логических
переменных, удовлетворяющих системе уравнений, имеющей специфичную
структуру.
Moved to Capistrano
fixed parser: function definition
new field added,  bug fix
added validation to ensure there are no multiple names
logs the time spork took to fire up
fixed spork timing variable (conflicted with thread variable)
changed spork waiting code to utilize pgrep instead of netstat
removed spork waiting code
Kowalski now abandons all runners when it finishes running its specs
fixed a typo
added another logger to include specs run and results of them
added hostname to the "specs and results" log
Correct broken links in docs
Correct correction
Fix a tiny typo
Merge pull request #1247 from dcelasun/patch-1

Fix a tiny typo
Merge pull request #1236 from kuroi/patch-1

Correct broken links in docs
Merge branch 'staging'
fix bug in eloquent model.
fix bug in eloquent model and update version.
Fix version in path file.
Fixed wrong return type in phpdoc

Signed-off-by: Daniel Bøndergaard <db@helmstmt.com>
Fixes XSS vulnerability in Profiler
Merge pull request #1305 from nmalcolm/develop

Fixes XSS vulnerability in Profiler
Update laravel/helpers.php

The e-helper and the __-Helper used the core-classes. 
So if I would like to override them, the helpers would still use the core-classes.
See this thread for further explanation: http://forums.laravel.com/viewtopic.php?id=2656 
Improving laravel relationship performance
Merge pull request #1314 from vFragosop/eloquent/relationship_performance

Huge performance increase on Eloquents relationships
Merge pull request #1307 from tillsanders/develop

Update laravel/helpers.php
Merge pull request #1294 from danielboendergaard/phpdoc-fix

Fixed wrong return type in phpdoc
Added a getInner method for retrieving the inner exception

Signed-off-by: Dejan Geci <dejan.geci@gmail.com>
Fixing pivot on has_one aswell as properly indenting
Merge pull request #1322 from vFragosop/eloquent/relationship_performance

Fixing has_one iterations
added redirect to the header to auto-go to games.php if they're logged in
fixed logout button in the three headers to call the logout.php file
added logout file to break current session and unset all session variables
ffdsadasdsc
replaced bg-image
usbdump: add -b busnum option.

If we want to sniff packets on one bus, we should use this option.

Signed-off-by: walimis <walimisdev@gmail.com>
use javascript to animate music player current playing title
prevent unintended caching
h3 to h2
Autoscroll the chat
codigo html depois do fim
Add a keyword
Merge branch 'master' of https://github.com/webmons/thedesk
Merge branch 'master' of https://github.com/webmons/thedesk